From 21f8d7ea6b728d473045198304592b61c610e49a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 20 Feb 1999 10:05:52 +0000 Subject: [PATCH] Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a window handle. If you can get the window handle into the python code, it should just work... More news on this later. Added wxImageList, wxToolTip. Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the wxRegConfig class. As usual, some bug fixes, tweaks, etc. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1737 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/README.txt | 10 +- utils/wxPython/src/gtk/cmndlgs.cpp | 4 + utils/wxPython/src/gtk/controls.cpp | 4 + utils/wxPython/src/gtk/controls2.cpp | 493 ++++++++++++++++++++++++++- utils/wxPython/src/gtk/controls2.py | 55 ++- utils/wxPython/src/gtk/events.cpp | 2 + utils/wxPython/src/gtk/frames.cpp | 4 + utils/wxPython/src/gtk/gdi.cpp | 296 +++++++++++++++- utils/wxPython/src/gtk/gdi.py | 50 +++ utils/wxPython/src/gtk/mdi.cpp | 4 + utils/wxPython/src/gtk/misc.cpp | 273 ++++++++++++--- utils/wxPython/src/gtk/misc.py | 61 +++- utils/wxPython/src/gtk/stattool.cpp | 345 +++++++++++++++++++ utils/wxPython/src/gtk/utils.cpp | 22 ++ utils/wxPython/src/gtk/utils.py | 3 + utils/wxPython/src/gtk/windows.cpp | 236 +++++++++++-- utils/wxPython/src/gtk/windows.py | 39 ++- utils/wxPython/src/gtk/windows2.cpp | 178 ++++++++++ utils/wxPython/src/gtk/windows2.py | 3 +- utils/wxPython/src/gtk/windows3.cpp | 4 + utils/wxPython/src/gtk/wx.cpp | 54 ++- utils/wxPython/src/gtk/wx.py | 35 +- utils/wxPython/src/msw/gdi.cpp | 136 ++++---- utils/wxPython/src/msw/gdi.py | 20 +- 24 files changed, 2137 insertions(+), 194 deletions(-) diff --git a/utils/wxPython/README.txt b/utils/wxPython/README.txt index bd752eb529..9683810dc8 100644 --- a/utils/wxPython/README.txt +++ b/utils/wxPython/README.txt @@ -73,7 +73,15 @@ in the wxWindows documentation tree specifically about wxPython, and I have added notes within the class references about where wxPython diverges from wxWindows. -[[ What else have I done??? ]] +Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a +window handle. If you can get the window handle into the python code, +it should just work... More news on this later. + +Added wxImageList, wxToolTip. + +Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the +wxRegConfig class. + As usual, some bug fixes, tweaks, etc. diff --git a/utils/wxPython/src/gtk/cmndlgs.cpp b/utils/wxPython/src/gtk/cmndlgs.cpp index a7cd02a7a4..a31c21456d 100644 --- a/utils/wxPython/src/gtk/cmndlgs.cpp +++ b/utils/wxPython/src/gtk/cmndlgs.cpp @@ -3569,6 +3569,7 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxPageSetupData","_class_wxPageSetupData",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); @@ -3578,6 +3579,7 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_long","_wxDash",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); + SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0); @@ -3603,6 +3605,7 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_class_wxPageSetupData","_wxPageSetupData",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); @@ -3752,6 +3755,7 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_short","_WXTYPE",0); SWIG_RegisterMapping("_short","_unsigned_short",0); SWIG_RegisterMapping("_short","_signed_short",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); diff --git a/utils/wxPython/src/gtk/controls.cpp b/utils/wxPython/src/gtk/controls.cpp index c02e218e84..63ba909af6 100644 --- a/utils/wxPython/src/gtk/controls.cpp +++ b/utils/wxPython/src/gtk/controls.cpp @@ -5471,6 +5471,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); @@ -5482,6 +5483,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_long","_wxDash",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); + SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0); SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); @@ -5497,6 +5499,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); @@ -5677,6 +5680,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0); SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0); SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); diff --git a/utils/wxPython/src/gtk/controls2.cpp b/utils/wxPython/src/gtk/controls2.cpp index ebe8c7781f..b340053dae 100644 --- a/utils/wxPython/src/gtk/controls2.cpp +++ b/utils/wxPython/src/gtk/controls2.cpp @@ -118,6 +118,28 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); static char* wxStringErrorMsg = "string type is required for parameter"; extern wxValidator wxPyDefaultValidator; +#define wxListItem_m_mask_set(_swigobj,_swigval) (_swigobj->m_mask = _swigval,_swigval) +static PyObject *_wrap_wxListItem_m_mask_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxListItem * _arg0; + long _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sl:wxListItem_m_mask_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_mask_set. Expected _wxListItem_p."); + return NULL; + } + } + _result = (long )wxListItem_m_mask_set(_arg0,_arg1); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + #define wxListItem_m_mask_get(_swigobj) ((long ) _swigobj->m_mask) static PyObject *_wrap_wxListItem_m_mask_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -139,6 +161,28 @@ static PyObject *_wrap_wxListItem_m_mask_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxListItem_m_itemId_set(_swigobj,_swigval) (_swigobj->m_itemId = _swigval,_swigval) +static PyObject *_wrap_wxListItem_m_itemId_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxListItem * _arg0; + long _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sl:wxListItem_m_itemId_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_itemId_set. Expected _wxListItem_p."); + return NULL; + } + } + _result = (long )wxListItem_m_itemId_set(_arg0,_arg1); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + #define wxListItem_m_itemId_get(_swigobj) ((long ) _swigobj->m_itemId) static PyObject *_wrap_wxListItem_m_itemId_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -160,6 +204,28 @@ static PyObject *_wrap_wxListItem_m_itemId_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxListItem_m_col_set(_swigobj,_swigval) (_swigobj->m_col = _swigval,_swigval) +static PyObject *_wrap_wxListItem_m_col_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxListItem * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxListItem_m_col_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_col_set. Expected _wxListItem_p."); + return NULL; + } + } + _result = (int )wxListItem_m_col_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxListItem_m_col_get(_swigobj) ((int ) _swigobj->m_col) static PyObject *_wrap_wxListItem_m_col_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -181,6 +247,28 @@ static PyObject *_wrap_wxListItem_m_col_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxListItem_m_state_set(_swigobj,_swigval) (_swigobj->m_state = _swigval,_swigval) +static PyObject *_wrap_wxListItem_m_state_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxListItem * _arg0; + long _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sl:wxListItem_m_state_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_state_set. Expected _wxListItem_p."); + return NULL; + } + } + _result = (long )wxListItem_m_state_set(_arg0,_arg1); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + #define wxListItem_m_state_get(_swigobj) ((long ) _swigobj->m_state) static PyObject *_wrap_wxListItem_m_state_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -202,6 +290,28 @@ static PyObject *_wrap_wxListItem_m_state_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxListItem_m_stateMask_set(_swigobj,_swigval) (_swigobj->m_stateMask = _swigval,_swigval) +static PyObject *_wrap_wxListItem_m_stateMask_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxListItem * _arg0; + long _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sl:wxListItem_m_stateMask_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_stateMask_set. Expected _wxListItem_p."); + return NULL; + } + } + _result = (long )wxListItem_m_stateMask_set(_arg0,_arg1); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + #define wxListItem_m_stateMask_get(_swigobj) ((long ) _swigobj->m_stateMask) static PyObject *_wrap_wxListItem_m_stateMask_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -223,6 +333,42 @@ static PyObject *_wrap_wxListItem_m_stateMask_get(PyObject *self, PyObject *args return _resultobj; } +#define wxListItem_m_text_set(_swigobj,_swigval) (_swigobj->m_text = *(_swigval),_swigval) +static PyObject *_wrap_wxListItem_m_text_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxListItem * _arg0; + wxString * _arg1; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sO:wxListItem_m_text_set",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_text_set. Expected _wxListItem_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + _result = (wxString *)wxListItem_m_text_set(_arg0,_arg1); +{ + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); +} +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxListItem_m_text_get(_swigobj) (&_swigobj->m_text) static PyObject *_wrap_wxListItem_m_text_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -246,6 +392,28 @@ static PyObject *_wrap_wxListItem_m_text_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxListItem_m_image_set(_swigobj,_swigval) (_swigobj->m_image = _swigval,_swigval) +static PyObject *_wrap_wxListItem_m_image_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxListItem * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxListItem_m_image_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_image_set. Expected _wxListItem_p."); + return NULL; + } + } + _result = (int )wxListItem_m_image_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxListItem_m_image_get(_swigobj) ((int ) _swigobj->m_image) static PyObject *_wrap_wxListItem_m_image_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -267,6 +435,28 @@ static PyObject *_wrap_wxListItem_m_image_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxListItem_m_data_set(_swigobj,_swigval) (_swigobj->m_data = _swigval,_swigval) +static PyObject *_wrap_wxListItem_m_data_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxListItem * _arg0; + long _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sl:wxListItem_m_data_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_data_set. Expected _wxListItem_p."); + return NULL; + } + } + _result = (long )wxListItem_m_data_set(_arg0,_arg1); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + #define wxListItem_m_data_get(_swigobj) ((long ) _swigobj->m_data) static PyObject *_wrap_wxListItem_m_data_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -288,6 +478,28 @@ static PyObject *_wrap_wxListItem_m_data_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxListItem_m_format_set(_swigobj,_swigval) (_swigobj->m_format = _swigval,_swigval) +static PyObject *_wrap_wxListItem_m_format_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxListItem * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxListItem_m_format_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_format_set. Expected _wxListItem_p."); + return NULL; + } + } + _result = (int )wxListItem_m_format_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxListItem_m_format_get(_swigobj) ((int ) _swigobj->m_format) static PyObject *_wrap_wxListItem_m_format_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -309,6 +521,28 @@ static PyObject *_wrap_wxListItem_m_format_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxListItem_m_width_set(_swigobj,_swigval) (_swigobj->m_width = _swigval,_swigval) +static PyObject *_wrap_wxListItem_m_width_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxListItem * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxListItem_m_width_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListItem_m_width_set. Expected _wxListItem_p."); + return NULL; + } + } + _result = (int )wxListItem_m_width_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxListItem_m_width_get(_swigobj) ((int ) _swigobj->m_width) static PyObject *_wrap_wxListItem_m_width_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -382,6 +616,28 @@ static void *SwigwxListEventTowxEvent(void *ptr) { return (void *) dest; } +#define wxListEvent_m_code_set(_swigobj,_swigval) (_swigobj->m_code = _swigval,_swigval) +static PyObject *_wrap_wxListEvent_m_code_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxListEvent * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxListEvent_m_code_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_code_set. Expected _wxListEvent_p."); + return NULL; + } + } + _result = (int )wxListEvent_m_code_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxListEvent_m_code_get(_swigobj) ((int ) _swigobj->m_code) static PyObject *_wrap_wxListEvent_m_code_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -403,6 +659,28 @@ static PyObject *_wrap_wxListEvent_m_code_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxListEvent_m_itemIndex_set(_swigobj,_swigval) (_swigobj->m_itemIndex = _swigval,_swigval) +static PyObject *_wrap_wxListEvent_m_itemIndex_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxListEvent * _arg0; + long _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sl:wxListEvent_m_itemIndex_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_itemIndex_set. Expected _wxListEvent_p."); + return NULL; + } + } + _result = (long )wxListEvent_m_itemIndex_set(_arg0,_arg1); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + #define wxListEvent_m_itemIndex_get(_swigobj) ((long ) _swigobj->m_itemIndex) static PyObject *_wrap_wxListEvent_m_itemIndex_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -424,6 +702,28 @@ static PyObject *_wrap_wxListEvent_m_itemIndex_get(PyObject *self, PyObject *arg return _resultobj; } +#define wxListEvent_m_oldItemIndex_set(_swigobj,_swigval) (_swigobj->m_oldItemIndex = _swigval,_swigval) +static PyObject *_wrap_wxListEvent_m_oldItemIndex_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxListEvent * _arg0; + long _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sl:wxListEvent_m_oldItemIndex_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_oldItemIndex_set. Expected _wxListEvent_p."); + return NULL; + } + } + _result = (long )wxListEvent_m_oldItemIndex_set(_arg0,_arg1); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + #define wxListEvent_m_oldItemIndex_get(_swigobj) ((long ) _swigobj->m_oldItemIndex) static PyObject *_wrap_wxListEvent_m_oldItemIndex_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -445,6 +745,28 @@ static PyObject *_wrap_wxListEvent_m_oldItemIndex_get(PyObject *self, PyObject * return _resultobj; } +#define wxListEvent_m_col_set(_swigobj,_swigval) (_swigobj->m_col = _swigval,_swigval) +static PyObject *_wrap_wxListEvent_m_col_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxListEvent * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxListEvent_m_col_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_col_set. Expected _wxListEvent_p."); + return NULL; + } + } + _result = (int )wxListEvent_m_col_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxListEvent_m_col_get(_swigobj) ((int ) _swigobj->m_col) static PyObject *_wrap_wxListEvent_m_col_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -466,6 +788,30 @@ static PyObject *_wrap_wxListEvent_m_col_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxListEvent_m_cancelled_set(_swigobj,_swigval) (_swigobj->m_cancelled = _swigval,_swigval) +static PyObject *_wrap_wxListEvent_m_cancelled_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxListEvent * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxListEvent_m_cancelled_set",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_cancelled_set. Expected _wxListEvent_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + _result = (bool )wxListEvent_m_cancelled_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxListEvent_m_cancelled_get(_swigobj) ((bool ) _swigobj->m_cancelled) static PyObject *_wrap_wxListEvent_m_cancelled_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -487,6 +833,37 @@ static PyObject *_wrap_wxListEvent_m_cancelled_get(PyObject *self, PyObject *arg return _resultobj; } +#define wxListEvent_m_pointDrag_set(_swigobj,_swigval) (_swigobj->m_pointDrag = *(_swigval),_swigval) +static PyObject *_wrap_wxListEvent_m_pointDrag_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxPoint * _result; + wxListEvent * _arg0; + wxPoint * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxListEvent_m_pointDrag_set",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_pointDrag_set. Expected _wxListEvent_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListEvent_m_pointDrag_set. Expected _wxPoint_p."); + return NULL; + } + } + _result = (wxPoint *)wxListEvent_m_pointDrag_set(_arg0,_arg1); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPoint_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxListEvent_m_pointDrag_get(_swigobj) (&_swigobj->m_pointDrag) static PyObject *_wrap_wxListEvent_m_pointDrag_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -510,6 +887,37 @@ static PyObject *_wrap_wxListEvent_m_pointDrag_get(PyObject *self, PyObject *arg return _resultobj; } +#define wxListEvent_m_item_set(_swigobj,_swigval) (_swigobj->m_item = *(_swigval),_swigval) +static PyObject *_wrap_wxListEvent_m_item_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxListItem * _result; + wxListEvent * _arg0; + wxListItem * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxListEvent_m_item_set",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListEvent_m_item_set. Expected _wxListEvent_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxListItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxListEvent_m_item_set. Expected _wxListItem_p."); + return NULL; + } + } + _result = (wxListItem *)wxListEvent_m_item_set(_arg0,_arg1); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxListItem_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxListEvent_m_item_get(_swigobj) (&_swigobj->m_item) static PyObject *_wrap_wxListEvent_m_item_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -612,7 +1020,7 @@ static PyObject *_wrap_wxListCtrl_Arrange(PyObject *self, PyObject *args) { PyObject * _resultobj; bool _result; wxListCtrl * _arg0; - int _arg1 = wxLIST_ALIGN_DEFAULT; + int _arg1 = (wxLIST_ALIGN_DEFAULT); char * _argc0 = 0; self = self; @@ -1034,7 +1442,7 @@ static PyObject *_wrap_wxListCtrl_GetItemRect(PyObject *self, PyObject *args) { wxRect * _result; wxListCtrl * _arg0; long _arg1; - int _arg2 = wxLIST_RECT_BOUNDS; + int _arg2 = (wxLIST_RECT_BOUNDS); char * _argc0 = 0; char _ptemp[128]; @@ -1154,8 +1562,8 @@ static PyObject *_wrap_wxListCtrl_GetNextItem(PyObject *self, PyObject *args) { long _result; wxListCtrl * _arg0; long _arg1; - int _arg2 = wxLIST_NEXT_ALL; - int _arg3 = wxLIST_STATE_DONTCARE; + int _arg2 = (wxLIST_NEXT_ALL); + int _arg3 = (wxLIST_STATE_DONTCARE); char * _argc0 = 0; self = self; @@ -1290,7 +1698,7 @@ static PyObject *_wrap_wxListCtrl_InsertColumn(PyObject *self, PyObject *args) { wxListCtrl * _arg0; long _arg1; wxString * _arg2; - int _arg3 = wxLIST_FORMAT_LEFT; + int _arg3 = (wxLIST_FORMAT_LEFT); int _arg4 = -1; char * _argc0 = 0; PyObject * _obj2 = 0; @@ -1607,8 +2015,8 @@ static PyObject *_wrap_wxListCtrl_SetItem(PyObject *self, PyObject *args) { return _resultobj; } -#define wxListCtrl_SetItemString(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->SetItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) -static PyObject *_wrap_wxListCtrl_SetItemString(PyObject *self, PyObject *args) { +#define wxListCtrl_SetStringItem(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->SetItem(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxListCtrl_SetStringItem(PyObject *self, PyObject *args) { PyObject * _resultobj; long _result; wxListCtrl * _arg0; @@ -1620,11 +2028,11 @@ static PyObject *_wrap_wxListCtrl_SetItemString(PyObject *self, PyObject *args) PyObject * _obj3 = 0; self = self; - if(!PyArg_ParseTuple(args,"sliO|i:wxListCtrl_SetItemString",&_argc0,&_arg1,&_arg2,&_obj3,&_arg4)) + if(!PyArg_ParseTuple(args,"sliO|i:wxListCtrl_SetStringItem",&_argc0,&_arg1,&_arg2,&_obj3,&_arg4)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetItemString. Expected _wxListCtrl_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_SetStringItem. Expected _wxListCtrl_p."); return NULL; } } @@ -1635,7 +2043,7 @@ static PyObject *_wrap_wxListCtrl_SetItemString(PyObject *self, PyObject *args) } _arg3 = new wxString(PyString_AsString(_obj3)); } - _result = (long )wxListCtrl_SetItemString(_arg0,_arg1,_arg2,*_arg3,_arg4); + _result = (long )wxListCtrl_SetStringItem(_arg0,_arg1,_arg2,*_arg3,_arg4); _resultobj = Py_BuildValue("l",_result); { if (_obj3) @@ -3833,7 +4241,7 @@ static PyMethodDef controls2cMethods[] = { { "wxListCtrl_SetItemPosition", _wrap_wxListCtrl_SetItemPosition, 1 }, { "wxListCtrl_SetItemImage", _wrap_wxListCtrl_SetItemImage, 1 }, { "wxListCtrl_SetItemData", _wrap_wxListCtrl_SetItemData, 1 }, - { "wxListCtrl_SetItemString", _wrap_wxListCtrl_SetItemString, 1 }, + { "wxListCtrl_SetStringItem", _wrap_wxListCtrl_SetStringItem, 1 }, { "wxListCtrl_SetItem", _wrap_wxListCtrl_SetItem, 1 }, { "wxListCtrl_SetImageList", _wrap_wxListCtrl_SetImageList, 1 }, { "wxListCtrl_SetColumnWidth", _wrap_wxListCtrl_SetColumnWidth, 1 }, @@ -3874,24 +4282,41 @@ static PyMethodDef controls2cMethods[] = { { "wxListCtrl_Arrange", _wrap_wxListCtrl_Arrange, 1 }, { "new_wxListCtrl", _wrap_new_wxListCtrl, 1 }, { "wxListEvent_m_item_get", _wrap_wxListEvent_m_item_get, 1 }, + { "wxListEvent_m_item_set", _wrap_wxListEvent_m_item_set, 1 }, { "wxListEvent_m_pointDrag_get", _wrap_wxListEvent_m_pointDrag_get, 1 }, + { "wxListEvent_m_pointDrag_set", _wrap_wxListEvent_m_pointDrag_set, 1 }, { "wxListEvent_m_cancelled_get", _wrap_wxListEvent_m_cancelled_get, 1 }, + { "wxListEvent_m_cancelled_set", _wrap_wxListEvent_m_cancelled_set, 1 }, { "wxListEvent_m_col_get", _wrap_wxListEvent_m_col_get, 1 }, + { "wxListEvent_m_col_set", _wrap_wxListEvent_m_col_set, 1 }, { "wxListEvent_m_oldItemIndex_get", _wrap_wxListEvent_m_oldItemIndex_get, 1 }, + { "wxListEvent_m_oldItemIndex_set", _wrap_wxListEvent_m_oldItemIndex_set, 1 }, { "wxListEvent_m_itemIndex_get", _wrap_wxListEvent_m_itemIndex_get, 1 }, + { "wxListEvent_m_itemIndex_set", _wrap_wxListEvent_m_itemIndex_set, 1 }, { "wxListEvent_m_code_get", _wrap_wxListEvent_m_code_get, 1 }, + { "wxListEvent_m_code_set", _wrap_wxListEvent_m_code_set, 1 }, { "delete_wxListItem", _wrap_delete_wxListItem, 1 }, { "new_wxListItem", _wrap_new_wxListItem, 1 }, { "wxListItem_m_width_get", _wrap_wxListItem_m_width_get, 1 }, + { "wxListItem_m_width_set", _wrap_wxListItem_m_width_set, 1 }, { "wxListItem_m_format_get", _wrap_wxListItem_m_format_get, 1 }, + { "wxListItem_m_format_set", _wrap_wxListItem_m_format_set, 1 }, { "wxListItem_m_data_get", _wrap_wxListItem_m_data_get, 1 }, + { "wxListItem_m_data_set", _wrap_wxListItem_m_data_set, 1 }, { "wxListItem_m_image_get", _wrap_wxListItem_m_image_get, 1 }, + { "wxListItem_m_image_set", _wrap_wxListItem_m_image_set, 1 }, { "wxListItem_m_text_get", _wrap_wxListItem_m_text_get, 1 }, + { "wxListItem_m_text_set", _wrap_wxListItem_m_text_set, 1 }, { "wxListItem_m_stateMask_get", _wrap_wxListItem_m_stateMask_get, 1 }, + { "wxListItem_m_stateMask_set", _wrap_wxListItem_m_stateMask_set, 1 }, { "wxListItem_m_state_get", _wrap_wxListItem_m_state_get, 1 }, + { "wxListItem_m_state_set", _wrap_wxListItem_m_state_set, 1 }, { "wxListItem_m_col_get", _wrap_wxListItem_m_col_get, 1 }, + { "wxListItem_m_col_set", _wrap_wxListItem_m_col_set, 1 }, { "wxListItem_m_itemId_get", _wrap_wxListItem_m_itemId_get, 1 }, + { "wxListItem_m_itemId_set", _wrap_wxListItem_m_itemId_set, 1 }, { "wxListItem_m_mask_get", _wrap_wxListItem_m_mask_get, 1 }, + { "wxListItem_m_mask_set", _wrap_wxListItem_m_mask_set, 1 }, { NULL, NULL } }; static PyObject *SWIG_globals; @@ -3903,6 +4328,48 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_globals = SWIG_newvarlink(); m = Py_InitModule("controls2c", controls2cMethods); d = PyModule_GetDict(m); + PyDict_SetItemString(d,"wxLIST_MASK_TEXT", PyInt_FromLong((long) wxLIST_MASK_TEXT)); + PyDict_SetItemString(d,"wxLIST_MASK_IMAGE", PyInt_FromLong((long) wxLIST_MASK_IMAGE)); + PyDict_SetItemString(d,"wxLIST_MASK_DATA", PyInt_FromLong((long) wxLIST_MASK_DATA)); + PyDict_SetItemString(d,"wxLIST_MASK_WIDTH", PyInt_FromLong((long) wxLIST_MASK_WIDTH)); + PyDict_SetItemString(d,"wxLIST_MASK_FORMAT", PyInt_FromLong((long) wxLIST_MASK_FORMAT)); + PyDict_SetItemString(d,"wxLIST_STATE_DONTCARE", PyInt_FromLong((long) wxLIST_STATE_DONTCARE)); + PyDict_SetItemString(d,"wxLIST_STATE_DROPHILITED", PyInt_FromLong((long) wxLIST_STATE_DROPHILITED)); + PyDict_SetItemString(d,"wxLIST_STATE_FOCUSED", PyInt_FromLong((long) wxLIST_STATE_FOCUSED)); + PyDict_SetItemString(d,"wxLIST_STATE_SELECTED", PyInt_FromLong((long) wxLIST_STATE_SELECTED)); + PyDict_SetItemString(d,"wxLIST_STATE_CUT", PyInt_FromLong((long) wxLIST_STATE_CUT)); + PyDict_SetItemString(d,"wxLIST_HITTEST_ABOVE", PyInt_FromLong((long) wxLIST_HITTEST_ABOVE)); + PyDict_SetItemString(d,"wxLIST_HITTEST_BELOW", PyInt_FromLong((long) wxLIST_HITTEST_BELOW)); + PyDict_SetItemString(d,"wxLIST_HITTEST_NOWHERE", PyInt_FromLong((long) wxLIST_HITTEST_NOWHERE)); + PyDict_SetItemString(d,"wxLIST_HITTEST_ONITEMICON", PyInt_FromLong((long) wxLIST_HITTEST_ONITEMICON)); + PyDict_SetItemString(d,"wxLIST_HITTEST_ONITEMLABEL", PyInt_FromLong((long) wxLIST_HITTEST_ONITEMLABEL)); + PyDict_SetItemString(d,"wxLIST_HITTEST_ONITEMRIGHT", PyInt_FromLong((long) wxLIST_HITTEST_ONITEMRIGHT)); + PyDict_SetItemString(d,"wxLIST_HITTEST_ONITEMSTATEICON", PyInt_FromLong((long) wxLIST_HITTEST_ONITEMSTATEICON)); + PyDict_SetItemString(d,"wxLIST_HITTEST_TOLEFT", PyInt_FromLong((long) wxLIST_HITTEST_TOLEFT)); + PyDict_SetItemString(d,"wxLIST_HITTEST_TORIGHT", PyInt_FromLong((long) wxLIST_HITTEST_TORIGHT)); + PyDict_SetItemString(d,"wxLIST_HITTEST_ONITEM", PyInt_FromLong((long) wxLIST_HITTEST_ONITEM)); + PyDict_SetItemString(d,"wxLIST_NEXT_ABOVE", PyInt_FromLong((long) wxLIST_NEXT_ABOVE)); + PyDict_SetItemString(d,"wxLIST_NEXT_ALL", PyInt_FromLong((long) wxLIST_NEXT_ALL)); + PyDict_SetItemString(d,"wxLIST_NEXT_BELOW", PyInt_FromLong((long) wxLIST_NEXT_BELOW)); + PyDict_SetItemString(d,"wxLIST_NEXT_LEFT", PyInt_FromLong((long) wxLIST_NEXT_LEFT)); + PyDict_SetItemString(d,"wxLIST_NEXT_RIGHT", PyInt_FromLong((long) wxLIST_NEXT_RIGHT)); + PyDict_SetItemString(d,"wxLIST_ALIGN_DEFAULT", PyInt_FromLong((long) wxLIST_ALIGN_DEFAULT)); + PyDict_SetItemString(d,"wxLIST_ALIGN_LEFT", PyInt_FromLong((long) wxLIST_ALIGN_LEFT)); + PyDict_SetItemString(d,"wxLIST_ALIGN_TOP", PyInt_FromLong((long) wxLIST_ALIGN_TOP)); + PyDict_SetItemString(d,"wxLIST_ALIGN_SNAP_TO_GRID", PyInt_FromLong((long) wxLIST_ALIGN_SNAP_TO_GRID)); + PyDict_SetItemString(d,"wxLIST_FORMAT_LEFT", PyInt_FromLong((long) wxLIST_FORMAT_LEFT)); + PyDict_SetItemString(d,"wxLIST_FORMAT_RIGHT", PyInt_FromLong((long) wxLIST_FORMAT_RIGHT)); + PyDict_SetItemString(d,"wxLIST_FORMAT_CENTRE", PyInt_FromLong((long) wxLIST_FORMAT_CENTRE)); + PyDict_SetItemString(d,"wxLIST_FORMAT_CENTER", PyInt_FromLong((long) wxLIST_FORMAT_CENTER)); + PyDict_SetItemString(d,"wxLIST_AUTOSIZE", PyInt_FromLong((long) wxLIST_AUTOSIZE)); + PyDict_SetItemString(d,"wxLIST_AUTOSIZE_USEHEADER", PyInt_FromLong((long) wxLIST_AUTOSIZE_USEHEADER)); + PyDict_SetItemString(d,"wxLIST_RECT_BOUNDS", PyInt_FromLong((long) wxLIST_RECT_BOUNDS)); + PyDict_SetItemString(d,"wxLIST_RECT_ICON", PyInt_FromLong((long) wxLIST_RECT_ICON)); + PyDict_SetItemString(d,"wxLIST_RECT_LABEL", PyInt_FromLong((long) wxLIST_RECT_LABEL)); + PyDict_SetItemString(d,"wxLIST_FIND_UP", PyInt_FromLong((long) wxLIST_FIND_UP)); + PyDict_SetItemString(d,"wxLIST_FIND_DOWN", PyInt_FromLong((long) wxLIST_FIND_DOWN)); + PyDict_SetItemString(d,"wxLIST_FIND_LEFT", PyInt_FromLong((long) wxLIST_FIND_LEFT)); + PyDict_SetItemString(d,"wxLIST_FIND_RIGHT", PyInt_FromLong((long) wxLIST_FIND_RIGHT)); /* * These are the pointer type-equivalency mappings. * (Used by the SWIG pointer type-checker). @@ -3927,6 +4394,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); @@ -3938,6 +4406,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_long","_wxDash",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); + SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0); SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); @@ -3954,6 +4423,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); @@ -4080,6 +4550,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0); SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0); SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); diff --git a/utils/wxPython/src/gtk/controls2.py b/utils/wxPython/src/gtk/controls2.py index 8319188707..6c518ce39d 100644 --- a/utils/wxPython/src/gtk/controls2.py +++ b/utils/wxPython/src/gtk/controls2.py @@ -179,6 +179,7 @@ class wxListCtrlPtr(wxControlPtr): return val def GetImageList(self,arg0): val = controls2c.wxListCtrl_GetImageList(self.this,arg0) + val = wxImageListPtr(val) return val def GetItemData(self,arg0): val = controls2c.wxListCtrl_GetItemData(self.this,arg0) @@ -253,13 +254,13 @@ class wxListCtrlPtr(wxControlPtr): val = controls2c.wxListCtrl_SetColumnWidth(self.this,arg0,arg1) return val def SetImageList(self,arg0,arg1): - val = controls2c.wxListCtrl_SetImageList(self.this,arg0,arg1) + val = controls2c.wxListCtrl_SetImageList(self.this,arg0.this,arg1) return val def SetItem(self,arg0): val = controls2c.wxListCtrl_SetItem(self.this,arg0.this) return val - def SetItemString(self,arg0,arg1,arg2,*args): - val = apply(controls2c.wxListCtrl_SetItemString,(self.this,arg0,arg1,arg2,)+args) + def SetStringItem(self,arg0,arg1,arg2,*args): + val = apply(controls2c.wxListCtrl_SetStringItem,(self.this,arg0,arg1,arg2,)+args) return val def SetItemData(self,arg0,arg1): val = controls2c.wxListCtrl_SetItemData(self.this,arg0,arg1) @@ -392,15 +393,17 @@ class wxTreeCtrlPtr(wxControlPtr): return val def GetImageList(self): val = controls2c.wxTreeCtrl_GetImageList(self.this) + val = wxImageListPtr(val) return val def GetStateImageList(self): val = controls2c.wxTreeCtrl_GetStateImageList(self.this) + val = wxImageListPtr(val) return val def SetImageList(self,arg0): - val = controls2c.wxTreeCtrl_SetImageList(self.this,arg0) + val = controls2c.wxTreeCtrl_SetImageList(self.this,arg0.this) return val def SetStateImageList(self,arg0): - val = controls2c.wxTreeCtrl_SetStateImageList(self.this,arg0) + val = controls2c.wxTreeCtrl_SetStateImageList(self.this,arg0.this) return val def GetItemText(self,arg0): val = controls2c.wxTreeCtrl_GetItemText(self.this,arg0.this) @@ -604,3 +607,45 @@ class wxTreeCtrl(wxTreeCtrlPtr): #-------------- VARIABLE WRAPPERS ------------------ +wxLIST_MASK_TEXT = controls2c.wxLIST_MASK_TEXT +wxLIST_MASK_IMAGE = controls2c.wxLIST_MASK_IMAGE +wxLIST_MASK_DATA = controls2c.wxLIST_MASK_DATA +wxLIST_MASK_WIDTH = controls2c.wxLIST_MASK_WIDTH +wxLIST_MASK_FORMAT = controls2c.wxLIST_MASK_FORMAT +wxLIST_STATE_DONTCARE = controls2c.wxLIST_STATE_DONTCARE +wxLIST_STATE_DROPHILITED = controls2c.wxLIST_STATE_DROPHILITED +wxLIST_STATE_FOCUSED = controls2c.wxLIST_STATE_FOCUSED +wxLIST_STATE_SELECTED = controls2c.wxLIST_STATE_SELECTED +wxLIST_STATE_CUT = controls2c.wxLIST_STATE_CUT +wxLIST_HITTEST_ABOVE = controls2c.wxLIST_HITTEST_ABOVE +wxLIST_HITTEST_BELOW = controls2c.wxLIST_HITTEST_BELOW +wxLIST_HITTEST_NOWHERE = controls2c.wxLIST_HITTEST_NOWHERE +wxLIST_HITTEST_ONITEMICON = controls2c.wxLIST_HITTEST_ONITEMICON +wxLIST_HITTEST_ONITEMLABEL = controls2c.wxLIST_HITTEST_ONITEMLABEL +wxLIST_HITTEST_ONITEMRIGHT = controls2c.wxLIST_HITTEST_ONITEMRIGHT +wxLIST_HITTEST_ONITEMSTATEICON = controls2c.wxLIST_HITTEST_ONITEMSTATEICON +wxLIST_HITTEST_TOLEFT = controls2c.wxLIST_HITTEST_TOLEFT +wxLIST_HITTEST_TORIGHT = controls2c.wxLIST_HITTEST_TORIGHT +wxLIST_HITTEST_ONITEM = controls2c.wxLIST_HITTEST_ONITEM +wxLIST_NEXT_ABOVE = controls2c.wxLIST_NEXT_ABOVE +wxLIST_NEXT_ALL = controls2c.wxLIST_NEXT_ALL +wxLIST_NEXT_BELOW = controls2c.wxLIST_NEXT_BELOW +wxLIST_NEXT_LEFT = controls2c.wxLIST_NEXT_LEFT +wxLIST_NEXT_RIGHT = controls2c.wxLIST_NEXT_RIGHT +wxLIST_ALIGN_DEFAULT = controls2c.wxLIST_ALIGN_DEFAULT +wxLIST_ALIGN_LEFT = controls2c.wxLIST_ALIGN_LEFT +wxLIST_ALIGN_TOP = controls2c.wxLIST_ALIGN_TOP +wxLIST_ALIGN_SNAP_TO_GRID = controls2c.wxLIST_ALIGN_SNAP_TO_GRID +wxLIST_FORMAT_LEFT = controls2c.wxLIST_FORMAT_LEFT +wxLIST_FORMAT_RIGHT = controls2c.wxLIST_FORMAT_RIGHT +wxLIST_FORMAT_CENTRE = controls2c.wxLIST_FORMAT_CENTRE +wxLIST_FORMAT_CENTER = controls2c.wxLIST_FORMAT_CENTER +wxLIST_AUTOSIZE = controls2c.wxLIST_AUTOSIZE +wxLIST_AUTOSIZE_USEHEADER = controls2c.wxLIST_AUTOSIZE_USEHEADER +wxLIST_RECT_BOUNDS = controls2c.wxLIST_RECT_BOUNDS +wxLIST_RECT_ICON = controls2c.wxLIST_RECT_ICON +wxLIST_RECT_LABEL = controls2c.wxLIST_RECT_LABEL +wxLIST_FIND_UP = controls2c.wxLIST_FIND_UP +wxLIST_FIND_DOWN = controls2c.wxLIST_FIND_DOWN +wxLIST_FIND_LEFT = controls2c.wxLIST_FIND_LEFT +wxLIST_FIND_RIGHT = controls2c.wxLIST_FIND_RIGHT diff --git a/utils/wxPython/src/gtk/events.cpp b/utils/wxPython/src/gtk/events.cpp index 9e9de5441c..0085917f82 100644 --- a/utils/wxPython/src/gtk/events.cpp +++ b/utils/wxPython/src/gtk/events.cpp @@ -2650,6 +2650,7 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0); SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxUpdateUIEvent","_class_wxUpdateUIEvent",0); SWIG_RegisterMapping("_byte","_unsigned_char",0); SWIG_RegisterMapping("_long","_unsigned_long",0); @@ -2661,6 +2662,7 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0); SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0); SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0); diff --git a/utils/wxPython/src/gtk/frames.cpp b/utils/wxPython/src/gtk/frames.cpp index 57545f5c1c..0d67ab33b3 100644 --- a/utils/wxPython/src/gtk/frames.cpp +++ b/utils/wxPython/src/gtk/frames.cpp @@ -806,6 +806,7 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); @@ -817,6 +818,7 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_long","_wxDash",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); + SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0); SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); @@ -833,6 +835,7 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); @@ -947,6 +950,7 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0); SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0); SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); SWIG_RegisterMapping("_wxFrame","_class_wxMiniFrame",SwigwxMiniFrameTowxFrame); SWIG_RegisterMapping("_wxFrame","_wxMiniFrame",SwigwxMiniFrameTowxFrame); diff --git a/utils/wxPython/src/gtk/gdi.cpp b/utils/wxPython/src/gtk/gdi.cpp index d2a718666f..a677cdb080 100644 --- a/utils/wxPython/src/gtk/gdi.cpp +++ b/utils/wxPython/src/gtk/gdi.cpp @@ -55,6 +55,7 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include +#include #ifndef __WXMSW__ #include #endif @@ -145,6 +146,8 @@ static char* wxStringErrorMsg = "string type is required for parameter"; wxMemoryDC* wxMemoryDCFromDC(wxDC* oldDC) { return new wxMemoryDC(oldDC); } + +#if 0 extern wxFont * wxNORMAL_FONT; extern wxFont * wxSMALL_FONT; extern wxFont * wxITALIC_FONT; @@ -187,6 +190,8 @@ extern wxBrush wxNullBrush; extern wxPalette wxNullPalette; extern wxFont wxNullFont; extern wxColour wxNullColour; + +#endif static PyObject *_wrap_wxEmptyBitmap(PyObject *self, PyObject *args) { PyObject * _resultobj; wxBitmap * _result; @@ -3597,8 +3602,62 @@ static PyObject *_wrap_wxDC_GetTextBackground(PyObject *self, PyObject *args) { return _resultobj; } -#define wxDC_GetTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) +#define wxDC_GetTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2)) static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxDC * _arg0; + wxString * _arg1; + long * _arg2; + long temp; + long * _arg3; + long temp0; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; +{ + _arg2 = &temp; +} +{ + _arg3 = &temp0; +} + if(!PyArg_ParseTuple(args,"sO:wxDC_GetTextExtent",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextExtent. Expected _wxDC_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + wxDC_GetTextExtent(_arg0,*_arg1,_arg2,_arg3); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg3)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxDC_GetFullTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_wxDC_GetFullTextExtent(PyObject *self, PyObject *args) { PyObject * _resultobj; wxDC * _arg0; wxString * _arg1; @@ -3610,8 +3669,10 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) { long temp1; long * _arg5; long temp2; + wxFont * _arg6 = NULL; char * _argc0 = 0; PyObject * _obj1 = 0; + char * _argc6 = 0; self = self; { @@ -3626,11 +3687,11 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) { { _arg5 = &temp2; } - if(!PyArg_ParseTuple(args,"sO:wxDC_GetTextExtent",&_argc0,&_obj1)) + if(!PyArg_ParseTuple(args,"sO|s:wxDC_GetFullTextExtent",&_argc0,&_obj1,&_argc6)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDC_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetTextExtent. Expected _wxDC_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDC_GetFullTextExtent. Expected _wxDC_p."); return NULL; } } @@ -3641,7 +3702,13 @@ static PyObject *_wrap_wxDC_GetTextExtent(PyObject *self, PyObject *args) { } _arg1 = new wxString(PyString_AsString(_obj1)); } - wxDC_GetTextExtent(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5); + if (_argc6) { + if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxFont_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxDC_GetFullTextExtent. Expected _wxFont_p."); + return NULL; + } + } + wxDC_GetFullTextExtent(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); Py_INCREF(Py_None); _resultobj = Py_None; { @@ -4809,7 +4876,216 @@ static PyObject *_wrap_wxPalette_Ok(PyObject *self, PyObject *args) { return _resultobj; } +#define new_wxImageList(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxImageList(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_new_wxImageList(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxImageList * _result; + int _arg0; + int _arg1; + bool _arg2 = (1); + int _arg3 = 1; + int tempbool2; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"ii|ii:new_wxImageList",&_arg0,&_arg1,&tempbool2,&_arg3)) + return NULL; + _arg2 = (bool ) tempbool2; + _result = (wxImageList *)new_wxImageList(_arg0,_arg1,_arg2,_arg3); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxImageList_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define delete_wxImageList(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxImageList(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxImageList * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:delete_wxImageList",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxImageList. Expected _wxImageList_p."); + return NULL; + } + } + delete_wxImageList(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxImageList_Add(_swigobj,_swigarg0) (_swigobj->Add(_swigarg0)) +static PyObject *_wrap_wxImageList_Add(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxImageList * _arg0; + wxBitmap * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxImageList_Add",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Add. Expected _wxImageList_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxImageList_Add. Expected _wxBitmap_p."); + return NULL; + } + } + _result = (int )wxImageList_Add(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxImageList_Replace(_swigobj,_swigarg0,_swigarg1) (_swigobj->Replace(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxImageList_Replace(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxImageList * _arg0; + int _arg1; + wxBitmap * _arg2; + char * _argc0 = 0; + char * _argc2 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sis:wxImageList_Replace",&_argc0,&_arg1,&_argc2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Replace. Expected _wxImageList_p."); + return NULL; + } + } + if (_argc2) { + if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Replace. Expected _wxBitmap_p."); + return NULL; + } + } + _result = (bool )wxImageList_Replace(_arg0,_arg1,*_arg2); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxImageList_Draw(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->Draw(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_wxImageList_Draw(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxImageList * _arg0; + int _arg1; + wxDC * _arg2; + int _arg3; + int _arg4; + int _arg5 = (wxIMAGELIST_DRAW_NORMAL); + bool _arg6 = (0); + char * _argc0 = 0; + char * _argc2 = 0; + int tempbool6; + + self = self; + if(!PyArg_ParseTuple(args,"sisii|ii:wxImageList_Draw",&_argc0,&_arg1,&_argc2,&_arg3,&_arg4,&_arg5,&tempbool6)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Draw. Expected _wxImageList_p."); + return NULL; + } + } + if (_argc2) { + if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Draw. Expected _wxDC_p."); + return NULL; + } + } + _arg6 = (bool ) tempbool6; + _result = (bool )wxImageList_Draw(_arg0,_arg1,*_arg2,_arg3,_arg4,_arg5,_arg6); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxImageList_GetImageCount(_swigobj) (_swigobj->GetImageCount()) +static PyObject *_wrap_wxImageList_GetImageCount(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxImageList * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxImageList_GetImageCount",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_GetImageCount. Expected _wxImageList_p."); + return NULL; + } + } + _result = (int )wxImageList_GetImageCount(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxImageList_Remove(_swigobj,_swigarg0) (_swigobj->Remove(_swigarg0)) +static PyObject *_wrap_wxImageList_Remove(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxImageList * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxImageList_Remove",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Remove. Expected _wxImageList_p."); + return NULL; + } + } + _result = (bool )wxImageList_Remove(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxImageList_RemoveAll(_swigobj) (_swigobj->RemoveAll()) +static PyObject *_wrap_wxImageList_RemoveAll(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxImageList * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxImageList_RemoveAll",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_RemoveAll. Expected _wxImageList_p."); + return NULL; + } + } + _result = (bool )wxImageList_RemoveAll(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static PyMethodDef gdicMethods[] = { + { "wxImageList_RemoveAll", _wrap_wxImageList_RemoveAll, 1 }, + { "wxImageList_Remove", _wrap_wxImageList_Remove, 1 }, + { "wxImageList_GetImageCount", _wrap_wxImageList_GetImageCount, 1 }, + { "wxImageList_Draw", _wrap_wxImageList_Draw, 1 }, + { "wxImageList_Replace", _wrap_wxImageList_Replace, 1 }, + { "wxImageList_Add", _wrap_wxImageList_Add, 1 }, + { "delete_wxImageList", _wrap_delete_wxImageList, 1 }, + { "new_wxImageList", _wrap_new_wxImageList, 1 }, { "wxPalette_Ok", _wrap_wxPalette_Ok, 1 }, { "wxPalette_GetRGB", _wrap_wxPalette_GetRGB, 1 }, { "wxPalette_GetPixel", _wrap_wxPalette_GetPixel, 1 }, @@ -4852,6 +5128,7 @@ static PyMethodDef gdicMethods[] = { { "wxDC_LogicalToDeviceXRel", _wrap_wxDC_LogicalToDeviceXRel, 1 }, { "wxDC_LogicalToDeviceX", _wrap_wxDC_LogicalToDeviceX, 1 }, { "wxDC_GetTextForeground", _wrap_wxDC_GetTextForeground, 1 }, + { "wxDC_GetFullTextExtent", _wrap_wxDC_GetFullTextExtent, 1 }, { "wxDC_GetTextExtent", _wrap_wxDC_GetTextExtent, 1 }, { "wxDC_GetTextBackground", _wrap_wxDC_GetTextBackground, 1 }, { "wxDC_GetSize", _wrap_wxDC_GetSize, 1 }, @@ -5020,6 +5297,13 @@ SWIGEXPORT(void,initgdic)() { SWIG_addvarlink(SWIG_globals,"wxNullPalette",_wrap_wxNullPalette_get, _wrap_wxNullPalette_set); SWIG_addvarlink(SWIG_globals,"wxNullFont",_wrap_wxNullFont_get, _wrap_wxNullFont_set); SWIG_addvarlink(SWIG_globals,"wxNullColour",_wrap_wxNullColour_get, _wrap_wxNullColour_set); + PyDict_SetItemString(d,"wxIMAGELIST_DRAW_NORMAL", PyInt_FromLong((long) wxIMAGELIST_DRAW_NORMAL)); + PyDict_SetItemString(d,"wxIMAGELIST_DRAW_TRANSPARENT", PyInt_FromLong((long) wxIMAGELIST_DRAW_TRANSPARENT)); + PyDict_SetItemString(d,"wxIMAGELIST_DRAW_SELECTED", PyInt_FromLong((long) wxIMAGELIST_DRAW_SELECTED)); + PyDict_SetItemString(d,"wxIMAGELIST_DRAW_FOCUSED", PyInt_FromLong((long) wxIMAGELIST_DRAW_FOCUSED)); + PyDict_SetItemString(d,"wxIMAGE_LIST_NORMAL", PyInt_FromLong((long) wxIMAGE_LIST_NORMAL)); + PyDict_SetItemString(d,"wxIMAGE_LIST_SMALL", PyInt_FromLong((long) wxIMAGE_LIST_SMALL)); + PyDict_SetItemString(d,"wxIMAGE_LIST_STATE", PyInt_FromLong((long) wxIMAGE_LIST_STATE)); /* * These are the pointer type-equivalency mappings. * (Used by the SWIG pointer type-checker). @@ -5029,12 +5313,14 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); SWIG_RegisterMapping("_byte","_unsigned_char",0); SWIG_RegisterMapping("_long","_wxDash",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); + SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); SWIG_RegisterMapping("_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC); SWIG_RegisterMapping("_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC); @@ -5051,6 +5337,7 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); SWIG_RegisterMapping("_wxBrush","_class_wxBrush",0); @@ -5122,6 +5409,7 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_short","_WXTYPE",0); SWIG_RegisterMapping("_short","_unsigned_short",0); SWIG_RegisterMapping("_short","_signed_short",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); diff --git a/utils/wxPython/src/gtk/gdi.py b/utils/wxPython/src/gtk/gdi.py index 05e3e899e9..724c81dd9a 100644 --- a/utils/wxPython/src/gtk/gdi.py +++ b/utils/wxPython/src/gtk/gdi.py @@ -450,6 +450,13 @@ class wxDCPtr : def GetTextExtent(self,arg0): val = gdic.wxDC_GetTextExtent(self.this,arg0) return val + def GetFullTextExtent(self,arg0,*args): + argl = map(None,args) + try: argl[0] = argl[0].this + except: pass + args = tuple(argl) + val = apply(gdic.wxDC_GetFullTextExtent,(self.this,arg0,)+args) + return val def GetTextForeground(self): val = gdic.wxDC_GetTextForeground(self.this) val = wxColourPtr(val) @@ -671,6 +678,41 @@ class wxPalette(wxPalettePtr): +class wxImageListPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self): + if self.thisown == 1 : + gdic.delete_wxImageList(self.this) + def Add(self,arg0): + val = gdic.wxImageList_Add(self.this,arg0.this) + return val + def Replace(self,arg0,arg1): + val = gdic.wxImageList_Replace(self.this,arg0,arg1.this) + return val + def Draw(self,arg0,arg1,arg2,arg3,*args): + val = apply(gdic.wxImageList_Draw,(self.this,arg0,arg1.this,arg2,arg3,)+args) + return val + def GetImageCount(self): + val = gdic.wxImageList_GetImageCount(self.this) + return val + def Remove(self,arg0): + val = gdic.wxImageList_Remove(self.this,arg0) + return val + def RemoveAll(self): + val = gdic.wxImageList_RemoveAll(self.this) + return val + def __repr__(self): + return "" +class wxImageList(wxImageListPtr): + def __init__(self,arg0,arg1,*args) : + self.this = apply(gdic.new_wxImageList,(arg0,arg1,)+args) + self.thisown = 1 + + + + #-------------- FUNCTION WRAPPERS ------------------ @@ -754,5 +796,13 @@ wxNullIcon = wxIconPtr(gdic.cvar.wxNullIcon) wxNullCursor = wxCursorPtr(gdic.cvar.wxNullCursor) wxNullPen = wxPenPtr(gdic.cvar.wxNullPen) wxNullBrush = wxBrushPtr(gdic.cvar.wxNullBrush) +wxNullPalette = wxPalettePtr(gdic.cvar.wxNullPalette) wxNullFont = wxFontPtr(gdic.cvar.wxNullFont) wxNullColour = wxColourPtr(gdic.cvar.wxNullColour) +wxIMAGELIST_DRAW_NORMAL = gdic.wxIMAGELIST_DRAW_NORMAL +wxIMAGELIST_DRAW_TRANSPARENT = gdic.wxIMAGELIST_DRAW_TRANSPARENT +wxIMAGELIST_DRAW_SELECTED = gdic.wxIMAGELIST_DRAW_SELECTED +wxIMAGELIST_DRAW_FOCUSED = gdic.wxIMAGELIST_DRAW_FOCUSED +wxIMAGE_LIST_NORMAL = gdic.wxIMAGE_LIST_NORMAL +wxIMAGE_LIST_SMALL = gdic.wxIMAGE_LIST_SMALL +wxIMAGE_LIST_STATE = gdic.wxIMAGE_LIST_STATE diff --git a/utils/wxPython/src/gtk/mdi.cpp b/utils/wxPython/src/gtk/mdi.cpp index 2f71933521..d0bac20db2 100644 --- a/utils/wxPython/src/gtk/mdi.cpp +++ b/utils/wxPython/src/gtk/mdi.cpp @@ -734,6 +734,7 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); @@ -745,6 +746,7 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_long","_wxDash",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); + SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0); SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); @@ -761,6 +763,7 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); @@ -881,6 +884,7 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0); SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0); SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); SWIG_RegisterMapping("_wxFrame","_class_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame); SWIG_RegisterMapping("_wxFrame","_wxMDIChildFrame",SwigwxMDIChildFrameTowxFrame); diff --git a/utils/wxPython/src/gtk/misc.cpp b/utils/wxPython/src/gtk/misc.cpp index b1fd570770..98b0862220 100644 --- a/utils/wxPython/src/gtk/misc.cpp +++ b/utils/wxPython/src/gtk/misc.cpp @@ -55,6 +55,7 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include +#include static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -121,6 +122,14 @@ static char* wxStringErrorMsg = "string type is required for parameter"; wxGetResource(section, entry, &retval, file); return retval; } + + void wxToolTip_Enable(bool flag) { + wxToolTip::Enable(flag); + } + + void wxToolTip_SetDelay(long milliseconds) { + wxToolTip::SetDelay(milliseconds); + } static PyObject *_wrap_wxFileSelector(PyObject *self, PyObject *args) { PyObject * _resultobj; wxString * _result; @@ -896,8 +905,36 @@ static PyObject *_wrap_wxResourceParseString(PyObject *self, PyObject *args) { return _resultobj; } +static PyObject *_wrap_wxToolTip_Enable(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _arg0; + int tempbool0; + + self = self; + if(!PyArg_ParseTuple(args,"i:wxToolTip_Enable",&tempbool0)) + return NULL; + _arg0 = (bool ) tempbool0; + wxToolTip_Enable(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static PyObject *_wrap_wxToolTip_SetDelay(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _arg0; + + self = self; + if(!PyArg_ParseTuple(args,"l:wxToolTip_SetDelay",&_arg0)) + return NULL; + wxToolTip_SetDelay(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxSize_x_set(_swigobj,_swigval) (_swigobj->x = _swigval,_swigval) -static PyObject *_wrap_wxSize_width_set(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxSize_x_set(PyObject *self, PyObject *args) { PyObject * _resultobj; long _result; wxSize * _arg0; @@ -905,11 +942,11 @@ static PyObject *_wrap_wxSize_width_set(PyObject *self, PyObject *args) { char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"sl:wxSize_width_set",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"sl:wxSize_x_set",&_argc0,&_arg1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_width_set. Expected _wxSize_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_x_set. Expected _wxSize_p."); return NULL; } } @@ -919,18 +956,18 @@ static PyObject *_wrap_wxSize_width_set(PyObject *self, PyObject *args) { } #define wxSize_x_get(_swigobj) ((long ) _swigobj->x) -static PyObject *_wrap_wxSize_width_get(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxSize_x_get(PyObject *self, PyObject *args) { PyObject * _resultobj; long _result; wxSize * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxSize_width_get",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxSize_x_get",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_width_get. Expected _wxSize_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_x_get. Expected _wxSize_p."); return NULL; } } @@ -940,7 +977,7 @@ static PyObject *_wrap_wxSize_width_get(PyObject *self, PyObject *args) { } #define wxSize_y_set(_swigobj,_swigval) (_swigobj->y = _swigval,_swigval) -static PyObject *_wrap_wxSize_height_set(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxSize_y_set(PyObject *self, PyObject *args) { PyObject * _resultobj; long _result; wxSize * _arg0; @@ -948,11 +985,11 @@ static PyObject *_wrap_wxSize_height_set(PyObject *self, PyObject *args) { char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"sl:wxSize_height_set",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"sl:wxSize_y_set",&_argc0,&_arg1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_height_set. Expected _wxSize_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_y_set. Expected _wxSize_p."); return NULL; } } @@ -962,18 +999,18 @@ static PyObject *_wrap_wxSize_height_set(PyObject *self, PyObject *args) { } #define wxSize_y_get(_swigobj) ((long ) _swigobj->y) -static PyObject *_wrap_wxSize_height_get(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxSize_y_get(PyObject *self, PyObject *args) { PyObject * _resultobj; long _result; wxSize * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxSize_height_get",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxSize_y_get",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_height_get. Expected _wxSize_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_y_get. Expected _wxSize_p."); return NULL; } } @@ -1043,70 +1080,70 @@ static PyObject *_wrap_wxSize_Set(PyObject *self, PyObject *args) { return _resultobj; } -#define wxSize_GetWidth(_swigobj) (_swigobj->GetX()) -static PyObject *_wrap_wxSize_GetWidth(PyObject *self, PyObject *args) { +#define wxSize_GetX(_swigobj) (_swigobj->GetX()) +static PyObject *_wrap_wxSize_GetX(PyObject *self, PyObject *args) { PyObject * _resultobj; long _result; wxSize * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxSize_GetWidth",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxSize_GetX",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetWidth. Expected _wxSize_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetX. Expected _wxSize_p."); return NULL; } } - _result = (long )wxSize_GetWidth(_arg0); + _result = (long )wxSize_GetX(_arg0); _resultobj = Py_BuildValue("l",_result); return _resultobj; } -#define wxSize_GetHeight(_swigobj) (_swigobj->GetY()) -static PyObject *_wrap_wxSize_GetHeight(PyObject *self, PyObject *args) { +#define wxSize_GetY(_swigobj) (_swigobj->GetY()) +static PyObject *_wrap_wxSize_GetY(PyObject *self, PyObject *args) { PyObject * _resultobj; long _result; wxSize * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxSize_GetHeight",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxSize_GetY",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetHeight. Expected _wxSize_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_GetY. Expected _wxSize_p."); return NULL; } } - _result = (long )wxSize_GetHeight(_arg0); + _result = (long )wxSize_GetY(_arg0); _resultobj = Py_BuildValue("l",_result); return _resultobj; } -static PyObject * wxSize___str__(wxSize *self) { +static PyObject * wxSize_asTuple(wxSize *self) { PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); return tup; } -static PyObject *_wrap_wxSize___str__(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxSize_asTuple(PyObject *self, PyObject *args) { PyObject * _resultobj; PyObject * _result; wxSize * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxSize___str__",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxSize_asTuple",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSize_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize___str__. Expected _wxSize_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSize_asTuple. Expected _wxSize_p."); return NULL; } } - _result = (PyObject *)wxSize___str__(_arg0); + _result = (PyObject *)wxSize_asTuple(_arg0); { _resultobj = _result; } @@ -1387,28 +1424,28 @@ static PyObject *_wrap_wxPoint_Set(PyObject *self, PyObject *args) { return _resultobj; } -static PyObject * wxPoint___str__(wxPoint *self) { +static PyObject * wxPoint_asTuple(wxPoint *self) { PyObject* tup = PyTuple_New(2); PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); return tup; } -static PyObject *_wrap_wxPoint___str__(PyObject *self, PyObject *args) { +static PyObject *_wrap_wxPoint_asTuple(PyObject *self, PyObject *args) { PyObject * _resultobj; PyObject * _result; wxPoint * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxPoint___str__",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxPoint_asTuple",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPoint_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint___str__. Expected _wxPoint_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPoint_asTuple. Expected _wxPoint_p."); return NULL; } } - _result = (PyObject *)wxPoint___str__(_arg0); + _result = (PyObject *)wxPoint_asTuple(_arg0); { _resultobj = _result; } @@ -1929,6 +1966,36 @@ static PyObject *_wrap_wxRect_height_get(PyObject *self, PyObject *args) { return _resultobj; } +static PyObject * wxRect_asTuple(wxRect *self) { + PyObject* tup = PyTuple_New(4); + PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->x)); + PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->y)); + PyTuple_SET_ITEM(tup, 0, PyInt_FromLong(self->width)); + PyTuple_SET_ITEM(tup, 1, PyInt_FromLong(self->height)); + return tup; + } +static PyObject *_wrap_wxRect_asTuple(PyObject *self, PyObject *args) { + PyObject * _resultobj; + PyObject * _result; + wxRect * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRect_asTuple",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRect_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRect_asTuple. Expected _wxRect_p."); + return NULL; + } + } + _result = (PyObject *)wxRect_asTuple(_arg0); +{ + _resultobj = _result; +} + return _resultobj; +} + #define new_wxPyTimer(_swigarg0) (new wxPyTimer(_swigarg0)) static PyObject *_wrap_new_wxPyTimer(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3184,7 +3251,122 @@ static PyObject *_wrap_new_wxAcceleratorTable(PyObject *self, PyObject *args) { return _resultobj; } +#define new_wxToolTip(_swigarg0) (new wxToolTip(_swigarg0)) +static PyObject *_wrap_new_wxToolTip(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxToolTip * _result; + wxString * _arg0; + PyObject * _obj0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"O:new_wxToolTip",&_obj0)) + return NULL; +{ + if (!PyString_Check(_obj0)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg0 = new wxString(PyString_AsString(_obj0)); +} + _result = (wxToolTip *)new_wxToolTip(*_arg0); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolTip_p"); + _resultobj = Py_BuildValue("s",_ptemp); +{ + if (_obj0) + delete _arg0; +} + return _resultobj; +} + +#define wxToolTip_SetTip(_swigobj,_swigarg0) (_swigobj->SetTip(_swigarg0)) +static PyObject *_wrap_wxToolTip_SetTip(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxToolTip * _arg0; + wxString * _arg1; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sO:wxToolTip_SetTip",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_SetTip. Expected _wxToolTip_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + wxToolTip_SetTip(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxToolTip_GetTip(_swigobj) (_swigobj->GetTip()) +static PyObject *_wrap_wxToolTip_GetTip(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxToolTip * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxToolTip_GetTip",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_GetTip. Expected _wxToolTip_p."); + return NULL; + } + } + _result = new wxString (wxToolTip_GetTip(_arg0)); +{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} + return _resultobj; +} + +#define wxToolTip_GetWindow(_swigobj) (_swigobj->GetWindow()) +static PyObject *_wrap_wxToolTip_GetWindow(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindow * _result; + wxToolTip * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxToolTip_GetWindow",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolTip_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolTip_GetWindow. Expected _wxToolTip_p."); + return NULL; + } + } + _result = (wxWindow *)wxToolTip_GetWindow(_arg0); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + static PyMethodDef misccMethods[] = { + { "wxToolTip_GetWindow", _wrap_wxToolTip_GetWindow, 1 }, + { "wxToolTip_GetTip", _wrap_wxToolTip_GetTip, 1 }, + { "wxToolTip_SetTip", _wrap_wxToolTip_SetTip, 1 }, + { "new_wxToolTip", _wrap_new_wxToolTip, 1 }, { "new_wxAcceleratorTable", _wrap_new_wxAcceleratorTable, 1 }, { "wxAcceleratorEntry_GetCommand", _wrap_wxAcceleratorEntry_GetCommand, 1 }, { "wxAcceleratorEntry_GetKeyCode", _wrap_wxAcceleratorEntry_GetKeyCode, 1 }, @@ -3238,6 +3420,7 @@ static PyMethodDef misccMethods[] = { { "wxPyTimer_Interval", _wrap_wxPyTimer_Interval, 1 }, { "delete_wxPyTimer", _wrap_delete_wxPyTimer, 1 }, { "new_wxPyTimer", _wrap_new_wxPyTimer, 1 }, + { "wxRect_asTuple", _wrap_wxRect_asTuple, 1 }, { "wxRect_height_get", _wrap_wxRect_height_get, 1 }, { "wxRect_height_set", _wrap_wxRect_height_set, 1 }, { "wxRect_width_get", _wrap_wxRect_width_get, 1 }, @@ -3262,7 +3445,7 @@ static PyMethodDef misccMethods[] = { { "wxRect_GetX", _wrap_wxRect_GetX, 1 }, { "delete_wxRect", _wrap_delete_wxRect, 1 }, { "new_wxRect", _wrap_new_wxRect, 1 }, - { "wxPoint___str__", _wrap_wxPoint___str__, 1 }, + { "wxPoint_asTuple", _wrap_wxPoint_asTuple, 1 }, { "wxPoint_Set", _wrap_wxPoint_Set, 1 }, { "delete_wxPoint", _wrap_delete_wxPoint, 1 }, { "new_wxPoint", _wrap_new_wxPoint, 1 }, @@ -3276,16 +3459,24 @@ static PyMethodDef misccMethods[] = { { "wxRealPoint_y_set", _wrap_wxRealPoint_y_set, 1 }, { "wxRealPoint_x_get", _wrap_wxRealPoint_x_get, 1 }, { "wxRealPoint_x_set", _wrap_wxRealPoint_x_set, 1 }, - { "wxSize___str__", _wrap_wxSize___str__, 1 }, - { "wxSize_GetHeight", _wrap_wxSize_GetHeight, 1 }, - { "wxSize_GetWidth", _wrap_wxSize_GetWidth, 1 }, + { "wxSize_asTuple", _wrap_wxSize_asTuple, 1 }, + { "wxSize_GetHeight", _wrap_wxSize_GetY, 1 }, + { "wxSize_GetWidth", _wrap_wxSize_GetX, 1 }, + { "wxSize_GetY", _wrap_wxSize_GetY, 1 }, + { "wxSize_GetX", _wrap_wxSize_GetX, 1 }, { "wxSize_Set", _wrap_wxSize_Set, 1 }, { "delete_wxSize", _wrap_delete_wxSize, 1 }, { "new_wxSize", _wrap_new_wxSize, 1 }, - { "wxSize_height_get", _wrap_wxSize_height_get, 1 }, - { "wxSize_height_set", _wrap_wxSize_height_set, 1 }, - { "wxSize_width_get", _wrap_wxSize_width_get, 1 }, - { "wxSize_width_set", _wrap_wxSize_width_set, 1 }, + { "wxSize_height_get", _wrap_wxSize_y_get, 1 }, + { "wxSize_height_set", _wrap_wxSize_y_set, 1 }, + { "wxSize_width_get", _wrap_wxSize_x_get, 1 }, + { "wxSize_width_set", _wrap_wxSize_x_set, 1 }, + { "wxSize_y_get", _wrap_wxSize_y_get, 1 }, + { "wxSize_y_set", _wrap_wxSize_y_set, 1 }, + { "wxSize_x_get", _wrap_wxSize_x_get, 1 }, + { "wxSize_x_set", _wrap_wxSize_x_set, 1 }, + { "wxToolTip_SetDelay", _wrap_wxToolTip_SetDelay, 1 }, + { "wxToolTip_Enable", _wrap_wxToolTip_Enable, 1 }, { "wxResourceParseString", _wrap_wxResourceParseString, 1 }, { "wxResourceParseFile", _wrap_wxResourceParseFile, 1 }, { "wxResourceParseData", _wrap_wxResourceParseData, 1 }, @@ -3358,11 +3549,13 @@ SWIGEXPORT(void,initmiscc)() { SWIG_RegisterMapping("_signed_long","_long",0); SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_byte","_unsigned_char",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_uint","_unsigned_int",0); SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); diff --git a/utils/wxPython/src/gtk/misc.py b/utils/wxPython/src/gtk/misc.py index 5b6db41e76..18324ea8a2 100644 --- a/utils/wxPython/src/gtk/misc.py +++ b/utils/wxPython/src/gtk/misc.py @@ -10,16 +10,28 @@ class wxSizePtr : def Set(self,arg0,arg1): val = miscc.wxSize_Set(self.this,arg0,arg1) return val + def GetX(self): + val = miscc.wxSize_GetX(self.this) + return val + def GetY(self): + val = miscc.wxSize_GetY(self.this) + return val def GetWidth(self): val = miscc.wxSize_GetWidth(self.this) return val def GetHeight(self): val = miscc.wxSize_GetHeight(self.this) return val - def __str__(self): - val = miscc.wxSize___str__(self.this) + def asTuple(self): + val = miscc.wxSize_asTuple(self.this) return val def __setattr__(self,name,value): + if name == "x" : + miscc.wxSize_x_set(self.this,value) + return + if name == "y" : + miscc.wxSize_y_set(self.this,value) + return if name == "width" : miscc.wxSize_width_set(self.this,value) return @@ -28,6 +40,10 @@ class wxSizePtr : return self.__dict__[name] = value def __getattr__(self,name): + if name == "x" : + return miscc.wxSize_x_get(self.this) + if name == "y" : + return miscc.wxSize_y_get(self.this) if name == "width" : return miscc.wxSize_width_get(self.this) if name == "height" : @@ -35,6 +51,8 @@ class wxSizePtr : raise AttributeError,name def __repr__(self): return "" + def __str__(self): return str(self.asTuple()) + def __repr__(self): return str(self.asTuple()) class wxSize(wxSizePtr): def __init__(self,*args) : self.this = apply(miscc.new_wxSize,()+args) @@ -84,8 +102,8 @@ class wxPointPtr : def Set(self,arg0,arg1): val = miscc.wxPoint_Set(self.this,arg0,arg1) return val - def __str__(self): - val = miscc.wxPoint___str__(self.this) + def asTuple(self): + val = miscc.wxPoint_asTuple(self.this) return val def __setattr__(self,name,value): if name == "x" : @@ -103,6 +121,8 @@ class wxPointPtr : raise AttributeError,name def __repr__(self): return "" + def __str__(self): return str(self.asTuple()) + def __repr__(self): return str(self.asTuple()) class wxPoint(wxPointPtr): def __init__(self,*args) : self.this = apply(miscc.new_wxPoint,()+args) @@ -164,6 +184,9 @@ class wxRectPtr : def GetRight(self): val = miscc.wxRect_GetRight(self.this) return val + def asTuple(self): + val = miscc.wxRect_asTuple(self.this) + return val def __setattr__(self,name,value): if name == "x" : miscc.wxRect_x_set(self.this,value) @@ -190,6 +213,8 @@ class wxRectPtr : raise AttributeError,name def __repr__(self): return "" + def __str__(self): return str(self.asTuple()) + def __repr__(self): return str(self.asTuple()) class wxRect(wxRectPtr): def __init__(self,*args) : self.this = apply(miscc.new_wxRect,()+args) @@ -460,6 +485,30 @@ class wxAcceleratorTable(wxAcceleratorTablePtr): +class wxToolTipPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def SetTip(self,arg0): + val = miscc.wxToolTip_SetTip(self.this,arg0) + return val + def GetTip(self): + val = miscc.wxToolTip_GetTip(self.this) + return val + def GetWindow(self): + val = miscc.wxToolTip_GetWindow(self.this) + val = wxWindowPtr(val) + return val + def __repr__(self): + return "" +class wxToolTip(wxToolTipPtr): + def __init__(self,arg0) : + self.this = miscc.new_wxToolTip(arg0) + self.thisown = 1 + + + + #-------------- FUNCTION WRAPPERS ------------------ @@ -589,6 +638,10 @@ wxResourceParseFile = miscc.wxResourceParseFile wxResourceParseString = miscc.wxResourceParseString +wxToolTip_Enable = miscc.wxToolTip_Enable + +wxToolTip_SetDelay = miscc.wxToolTip_SetDelay + #-------------- VARIABLE WRAPPERS ------------------ diff --git a/utils/wxPython/src/gtk/stattool.cpp b/utils/wxPython/src/gtk/stattool.cpp index 8c4dc527c1..3f1e5e517d 100644 --- a/utils/wxPython/src/gtk/stattool.cpp +++ b/utils/wxPython/src/gtk/stattool.cpp @@ -461,6 +461,28 @@ static PyObject *_wrap_delete_wxToolBarTool(PyObject *self, PyObject *args) { return _resultobj; } +#define wxToolBarTool_m_toolStyle_set(_swigobj,_swigval) (_swigobj->m_toolStyle = _swigval,_swigval) +static PyObject *_wrap_wxToolBarTool_m_toolStyle_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxToolBarTool * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_toolStyle_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toolStyle_set. Expected _wxToolBarTool_p."); + return NULL; + } + } + _result = (int )wxToolBarTool_m_toolStyle_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxToolBarTool_m_toolStyle_get(_swigobj) ((int ) _swigobj->m_toolStyle) static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -482,6 +504,37 @@ static PyObject *_wrap_wxToolBarTool_m_toolStyle_get(PyObject *self, PyObject *a return _resultobj; } +#define wxToolBarTool_m_clientData_set(_swigobj,_swigval) (_swigobj->m_clientData = _swigval,_swigval) +static PyObject *_wrap_wxToolBarTool_m_clientData_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxObject * _result; + wxToolBarTool * _arg0; + wxObject * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxToolBarTool_m_clientData_set",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_clientData_set. Expected _wxToolBarTool_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxObject_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_clientData_set. Expected _wxObject_p."); + return NULL; + } + } + _result = (wxObject *)wxToolBarTool_m_clientData_set(_arg0,_arg1); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxObject_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxToolBarTool_m_clientData_get(_swigobj) ((wxObject *) _swigobj->m_clientData) static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -505,6 +558,28 @@ static PyObject *_wrap_wxToolBarTool_m_clientData_get(PyObject *self, PyObject * return _resultobj; } +#define wxToolBarTool_m_index_set(_swigobj,_swigval) (_swigobj->m_index = _swigval,_swigval) +static PyObject *_wrap_wxToolBarTool_m_index_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxToolBarTool * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_index_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_index_set. Expected _wxToolBarTool_p."); + return NULL; + } + } + _result = (int )wxToolBarTool_m_index_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxToolBarTool_m_index_get(_swigobj) ((int ) _swigobj->m_index) static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -526,6 +601,30 @@ static PyObject *_wrap_wxToolBarTool_m_index_get(PyObject *self, PyObject *args) return _resultobj; } +#define wxToolBarTool_m_toggleState_set(_swigobj,_swigval) (_swigobj->m_toggleState = _swigval,_swigval) +static PyObject *_wrap_wxToolBarTool_m_toggleState_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxToolBarTool * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_toggleState_set",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_toggleState_set. Expected _wxToolBarTool_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + _result = (bool )wxToolBarTool_m_toggleState_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxToolBarTool_m_toggleState_get(_swigobj) ((bool ) _swigobj->m_toggleState) static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -547,6 +646,30 @@ static PyObject *_wrap_wxToolBarTool_m_toggleState_get(PyObject *self, PyObject return _resultobj; } +#define wxToolBarTool_m_isToggle_set(_swigobj,_swigval) (_swigobj->m_isToggle = _swigval,_swigval) +static PyObject *_wrap_wxToolBarTool_m_isToggle_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxToolBarTool * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_isToggle_set",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isToggle_set. Expected _wxToolBarTool_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + _result = (bool )wxToolBarTool_m_isToggle_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxToolBarTool_m_isToggle_get(_swigobj) ((bool ) _swigobj->m_isToggle) static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -568,6 +691,30 @@ static PyObject *_wrap_wxToolBarTool_m_isToggle_get(PyObject *self, PyObject *ar return _resultobj; } +#define wxToolBarTool_m_deleteSecondBitmap_set(_swigobj,_swigval) (_swigobj->m_deleteSecondBitmap = _swigval,_swigval) +static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxToolBarTool * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_deleteSecondBitmap_set",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_deleteSecondBitmap_set. Expected _wxToolBarTool_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + _result = (bool )wxToolBarTool_m_deleteSecondBitmap_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxToolBarTool_m_deleteSecondBitmap_get(_swigobj) ((bool ) _swigobj->m_deleteSecondBitmap) static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -589,6 +736,30 @@ static PyObject *_wrap_wxToolBarTool_m_deleteSecondBitmap_get(PyObject *self, Py return _resultobj; } +#define wxToolBarTool_m_enabled_set(_swigobj,_swigval) (_swigobj->m_enabled = _swigval,_swigval) +static PyObject *_wrap_wxToolBarTool_m_enabled_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxToolBarTool * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_enabled_set",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_enabled_set. Expected _wxToolBarTool_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + _result = (bool )wxToolBarTool_m_enabled_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxToolBarTool_m_enabled_get(_swigobj) ((bool ) _swigobj->m_enabled) static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -610,6 +781,37 @@ static PyObject *_wrap_wxToolBarTool_m_enabled_get(PyObject *self, PyObject *arg return _resultobj; } +#define wxToolBarTool_m_bitmap1_set(_swigobj,_swigval) (_swigobj->m_bitmap1 = *(_swigval),_swigval) +static PyObject *_wrap_wxToolBarTool_m_bitmap1_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxBitmap * _result; + wxToolBarTool * _arg0; + wxBitmap * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxToolBarTool_m_bitmap1_set",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap1_set. Expected _wxToolBarTool_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_bitmap1_set. Expected _wxBitmap_p."); + return NULL; + } + } + _result = (wxBitmap *)wxToolBarTool_m_bitmap1_set(_arg0,_arg1); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxToolBarTool_m_bitmap1_get(_swigobj) (&_swigobj->m_bitmap1) static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -633,6 +835,37 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap1_get(PyObject *self, PyObject *arg return _resultobj; } +#define wxToolBarTool_m_bitmap2_set(_swigobj,_swigval) (_swigobj->m_bitmap2 = *(_swigval),_swigval) +static PyObject *_wrap_wxToolBarTool_m_bitmap2_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxBitmap * _result; + wxToolBarTool * _arg0; + wxBitmap * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxToolBarTool_m_bitmap2_set",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_bitmap2_set. Expected _wxToolBarTool_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxToolBarTool_m_bitmap2_set. Expected _wxBitmap_p."); + return NULL; + } + } + _result = (wxBitmap *)wxToolBarTool_m_bitmap2_set(_arg0,_arg1); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxToolBarTool_m_bitmap2_get(_swigobj) (&_swigobj->m_bitmap2) static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -656,6 +889,30 @@ static PyObject *_wrap_wxToolBarTool_m_bitmap2_get(PyObject *self, PyObject *arg return _resultobj; } +#define wxToolBarTool_m_isMenuCommand_set(_swigobj,_swigval) (_swigobj->m_isMenuCommand = _swigval,_swigval) +static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxToolBarTool * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxToolBarTool_m_isMenuCommand_set",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_isMenuCommand_set. Expected _wxToolBarTool_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + _result = (bool )wxToolBarTool_m_isMenuCommand_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxToolBarTool_m_isMenuCommand_get(_swigobj) ((bool ) _swigobj->m_isMenuCommand) static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -677,6 +934,42 @@ static PyObject *_wrap_wxToolBarTool_m_isMenuCommand_get(PyObject *self, PyObjec return _resultobj; } +#define wxToolBarTool_m_shortHelpString_set(_swigobj,_swigval) (_swigobj->m_shortHelpString = *(_swigval),_swigval) +static PyObject *_wrap_wxToolBarTool_m_shortHelpString_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxToolBarTool * _arg0; + wxString * _arg1; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sO:wxToolBarTool_m_shortHelpString_set",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_shortHelpString_set. Expected _wxToolBarTool_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + _result = (wxString *)wxToolBarTool_m_shortHelpString_set(_arg0,_arg1); +{ + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); +} +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxToolBarTool_m_shortHelpString_get(_swigobj) (&_swigobj->m_shortHelpString) static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -700,6 +993,42 @@ static PyObject *_wrap_wxToolBarTool_m_shortHelpString_get(PyObject *self, PyObj return _resultobj; } +#define wxToolBarTool_m_longHelpString_set(_swigobj,_swigval) (_swigobj->m_longHelpString = *(_swigval),_swigval) +static PyObject *_wrap_wxToolBarTool_m_longHelpString_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxToolBarTool * _arg0; + wxString * _arg1; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sO:wxToolBarTool_m_longHelpString_set",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBarTool_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarTool_m_longHelpString_set. Expected _wxToolBarTool_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + _result = (wxString *)wxToolBarTool_m_longHelpString_set(_arg0,_arg1); +{ + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); +} +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxToolBarTool_m_longHelpString_get(_swigobj) (&_swigobj->m_longHelpString) static PyObject *_wrap_wxToolBarTool_m_longHelpString_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -1323,17 +1652,29 @@ static PyMethodDef stattoolcMethods[] = { { "wxToolBar_AddSeparator", _wrap_wxToolBar_AddSeparator, 1 }, { "new_wxToolBar", _wrap_new_wxToolBar, 1 }, { "wxToolBarTool_m_longHelpString_get", _wrap_wxToolBarTool_m_longHelpString_get, 1 }, + { "wxToolBarTool_m_longHelpString_set", _wrap_wxToolBarTool_m_longHelpString_set, 1 }, { "wxToolBarTool_m_shortHelpString_get", _wrap_wxToolBarTool_m_shortHelpString_get, 1 }, + { "wxToolBarTool_m_shortHelpString_set", _wrap_wxToolBarTool_m_shortHelpString_set, 1 }, { "wxToolBarTool_m_isMenuCommand_get", _wrap_wxToolBarTool_m_isMenuCommand_get, 1 }, + { "wxToolBarTool_m_isMenuCommand_set", _wrap_wxToolBarTool_m_isMenuCommand_set, 1 }, { "wxToolBarTool_m_bitmap2_get", _wrap_wxToolBarTool_m_bitmap2_get, 1 }, + { "wxToolBarTool_m_bitmap2_set", _wrap_wxToolBarTool_m_bitmap2_set, 1 }, { "wxToolBarTool_m_bitmap1_get", _wrap_wxToolBarTool_m_bitmap1_get, 1 }, + { "wxToolBarTool_m_bitmap1_set", _wrap_wxToolBarTool_m_bitmap1_set, 1 }, { "wxToolBarTool_m_enabled_get", _wrap_wxToolBarTool_m_enabled_get, 1 }, + { "wxToolBarTool_m_enabled_set", _wrap_wxToolBarTool_m_enabled_set, 1 }, { "wxToolBarTool_m_deleteSecondBitmap_get", _wrap_wxToolBarTool_m_deleteSecondBitmap_get, 1 }, + { "wxToolBarTool_m_deleteSecondBitmap_set", _wrap_wxToolBarTool_m_deleteSecondBitmap_set, 1 }, { "wxToolBarTool_m_isToggle_get", _wrap_wxToolBarTool_m_isToggle_get, 1 }, + { "wxToolBarTool_m_isToggle_set", _wrap_wxToolBarTool_m_isToggle_set, 1 }, { "wxToolBarTool_m_toggleState_get", _wrap_wxToolBarTool_m_toggleState_get, 1 }, + { "wxToolBarTool_m_toggleState_set", _wrap_wxToolBarTool_m_toggleState_set, 1 }, { "wxToolBarTool_m_index_get", _wrap_wxToolBarTool_m_index_get, 1 }, + { "wxToolBarTool_m_index_set", _wrap_wxToolBarTool_m_index_set, 1 }, { "wxToolBarTool_m_clientData_get", _wrap_wxToolBarTool_m_clientData_get, 1 }, + { "wxToolBarTool_m_clientData_set", _wrap_wxToolBarTool_m_clientData_set, 1 }, { "wxToolBarTool_m_toolStyle_get", _wrap_wxToolBarTool_m_toolStyle_get, 1 }, + { "wxToolBarTool_m_toolStyle_set", _wrap_wxToolBarTool_m_toolStyle_set, 1 }, { "delete_wxToolBarTool", _wrap_delete_wxToolBarTool, 1 }, { "new_wxToolBarTool", _wrap_new_wxToolBarTool, 1 }, { "wxStatusBar_SetStatusWidths", _wrap_wxStatusBar_SetStatusWidths, 1 }, @@ -1376,6 +1717,7 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); @@ -1387,6 +1729,7 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_long","_wxDash",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); + SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0); SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); @@ -1403,6 +1746,7 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); @@ -1518,6 +1862,7 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0); SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0); SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); diff --git a/utils/wxPython/src/gtk/utils.cpp b/utils/wxPython/src/gtk/utils.cpp index 32a5941514..239566a781 100644 --- a/utils/wxPython/src/gtk/utils.cpp +++ b/utils/wxPython/src/gtk/utils.cpp @@ -239,6 +239,27 @@ static PyObject *_wrap_wxConfig_DontCreateOnDemand(PyObject *self, PyObject *arg return _resultobj; } +#define wxConfig_DeleteAll(_swigobj) (_swigobj->DeleteAll()) +static PyObject *_wrap_wxConfig_DeleteAll(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxConfig * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxConfig_DeleteAll",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxConfig_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxConfig_DeleteAll. Expected _wxConfig_p."); + return NULL; + } + } + _result = (bool )wxConfig_DeleteAll(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxConfig_DeleteEntry(_swigobj,_swigarg0,_swigarg1) (_swigobj->DeleteEntry(_swigarg0,_swigarg1)) static PyObject *_wrap_wxConfig_DeleteEntry(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -1143,6 +1164,7 @@ static PyMethodDef utilscMethods[] = { { "wxConfig_Exists", _wrap_wxConfig_Exists, 1 }, { "wxConfig_DeleteGroup", _wrap_wxConfig_DeleteGroup, 1 }, { "wxConfig_DeleteEntry", _wrap_wxConfig_DeleteEntry, 1 }, + { "wxConfig_DeleteAll", _wrap_wxConfig_DeleteAll, 1 }, { "wxConfig_DontCreateOnDemand", _wrap_wxConfig_DontCreateOnDemand, 1 }, { "delete_wxConfig", _wrap_delete_wxConfig, 1 }, { "new_wxConfig", _wrap_new_wxConfig, 1 }, diff --git a/utils/wxPython/src/gtk/utils.py b/utils/wxPython/src/gtk/utils.py index 3128077d1a..c37f637d95 100644 --- a/utils/wxPython/src/gtk/utils.py +++ b/utils/wxPython/src/gtk/utils.py @@ -10,6 +10,9 @@ class wxConfigPtr : def DontCreateOnDemand(self): val = utilsc.wxConfig_DontCreateOnDemand(self.this) return val + def DeleteAll(self): + val = utilsc.wxConfig_DeleteAll(self.this) + return val def DeleteEntry(self,arg0,*args): val = apply(utilsc.wxConfig_DeleteEntry,(self.this,arg0,)+args) return val diff --git a/utils/wxPython/src/gtk/windows.cpp b/utils/wxPython/src/gtk/windows.cpp index 6a7de6835a..29e66edbb8 100644 --- a/utils/wxPython/src/gtk/windows.cpp +++ b/utils/wxPython/src/gtk/windows.cpp @@ -265,8 +265,8 @@ static PyObject *_wrap_wxWindow_Centre(PyObject *self, PyObject *args) { return _resultobj; } -#define wxWindow_ClientToScreen(_swigobj,_swigarg0,_swigarg1) (_swigobj->ClientToScreen(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) { +#define wxWindow_ClientToScreenXY(_swigobj,_swigarg0,_swigarg1) (_swigobj->ClientToScreen(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxWindow_ClientToScreenXY(PyObject *self, PyObject *args) { PyObject * _resultobj; wxWindow * _arg0; int * _arg1; @@ -278,11 +278,11 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) { PyObject * _obj2 = 0; self = self; - if(!PyArg_ParseTuple(args,"sOO:wxWindow_ClientToScreen",&_argc0,&_obj1,&_obj2)) + if(!PyArg_ParseTuple(args,"sOO:wxWindow_ClientToScreenXY",&_argc0,&_obj1,&_obj2)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClientToScreen. Expected _wxWindow_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ClientToScreenXY. Expected _wxWindow_p."); return NULL; } } @@ -294,7 +294,7 @@ static PyObject *_wrap_wxWindow_ClientToScreen(PyObject *self, PyObject *args) { temp0 = (int) PyInt_AsLong(_obj2); _arg2 = &temp0; } - wxWindow_ClientToScreen(_arg0,_arg1,_arg2); + wxWindow_ClientToScreenXY(_arg0,_arg1,_arg2); Py_INCREF(Py_None); _resultobj = Py_None; { @@ -398,8 +398,8 @@ static PyObject *_wrap_wxWindow_Enable(PyObject *self, PyObject *args) { return _resultobj; } -#define wxWindow_FindWindowByID(_swigobj,_swigarg0) (_swigobj->FindWindow(_swigarg0)) -static PyObject *_wrap_wxWindow_FindWindowByID(PyObject *self, PyObject *args) { +#define wxWindow_FindWindowById(_swigobj,_swigarg0) (_swigobj->FindWindow(_swigarg0)) +static PyObject *_wrap_wxWindow_FindWindowById(PyObject *self, PyObject *args) { PyObject * _resultobj; wxWindow * _result; wxWindow * _arg0; @@ -408,15 +408,15 @@ static PyObject *_wrap_wxWindow_FindWindowByID(PyObject *self, PyObject *args) { char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"sl:wxWindow_FindWindowByID",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"sl:wxWindow_FindWindowById",&_argc0,&_arg1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_FindWindowByID. Expected _wxWindow_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_FindWindowById. Expected _wxWindow_p."); return NULL; } } - _result = (wxWindow *)wxWindow_FindWindowByID(_arg0,_arg1); + _result = (wxWindow *)wxWindow_FindWindowById(_arg0,_arg1); SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindow_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -1089,6 +1089,88 @@ static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) { return _resultobj; } +#define wxWindow_GetFullTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_wxWindow_GetFullTextExtent(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindow * _arg0; + wxString * _arg1; + int * _arg2; + int temp; + int * _arg3; + int temp0; + int * _arg4; + int temp1; + int * _arg5; + int temp2; + wxFont * _arg6 = NULL; + char * _argc0 = 0; + PyObject * _obj1 = 0; + char * _argc6 = 0; + + self = self; +{ + _arg2 = &temp; +} +{ + _arg3 = &temp0; +} +{ + _arg4 = &temp1; +} +{ + _arg5 = &temp2; +} + if(!PyArg_ParseTuple(args,"sO|s:wxWindow_GetFullTextExtent",&_argc0,&_obj1,&_argc6)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetFullTextExtent. Expected _wxWindow_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + if (_argc6) { + if (SWIG_GetPtr(_argc6,(void **) &_arg6,"_wxFont_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 7 of wxWindow_GetFullTextExtent. Expected _wxFont_p."); + return NULL; + } + } + wxWindow_GetFullTextExtent(_arg0,*_arg1,_arg2,_arg3,_arg4,_arg5,_arg6); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg2)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg3)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg4)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + PyObject *o; + o = PyInt_FromLong((long) (*_arg5)); + _resultobj = t_output_helper(_resultobj, o); +} +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxWindow_GetTitle(_swigobj) (_swigobj->GetTitle()) static PyObject *_wrap_wxWindow_GetTitle(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -1336,8 +1418,8 @@ static PyObject *_wrap_wxWindow_MakeModal(PyObject *self, PyObject *args) { return _resultobj; } -#define wxWindow_Move(_swigobj,_swigarg0,_swigarg1) (_swigobj->Move(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) { +#define wxWindow_MoveXY(_swigobj,_swigarg0,_swigarg1) (_swigobj->Move(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxWindow_MoveXY(PyObject *self, PyObject *args) { PyObject * _resultobj; wxWindow * _arg0; int _arg1; @@ -1345,15 +1427,15 @@ static PyObject *_wrap_wxWindow_Move(PyObject *self, PyObject *args) { char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"sii:wxWindow_Move",&_argc0,&_arg1,&_arg2)) + if(!PyArg_ParseTuple(args,"sii:wxWindow_MoveXY",&_argc0,&_arg1,&_arg2)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_Move. Expected _wxWindow_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_MoveXY. Expected _wxWindow_p."); return NULL; } } - wxWindow_Move(_arg0,_arg1,_arg2); + wxWindow_MoveXY(_arg0,_arg1,_arg2); Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -1464,8 +1546,8 @@ static PyObject *_wrap_wxWindow_ReleaseMouse(PyObject *self, PyObject *args) { return _resultobj; } -#define wxWindow_ScreenToClient(_swigobj,_swigarg0,_swigarg1) (_swigobj->ScreenToClient(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) { +#define wxWindow_ScreenToClientXY(_swigobj,_swigarg0,_swigarg1) (_swigobj->ScreenToClient(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxWindow_ScreenToClientXY(PyObject *self, PyObject *args) { PyObject * _resultobj; wxWindow * _arg0; int * _arg1; @@ -1477,11 +1559,11 @@ static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) { PyObject * _obj2 = 0; self = self; - if(!PyArg_ParseTuple(args,"sOO:wxWindow_ScreenToClient",&_argc0,&_obj1,&_obj2)) + if(!PyArg_ParseTuple(args,"sOO:wxWindow_ScreenToClientXY",&_argc0,&_obj1,&_obj2)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScreenToClient. Expected _wxWindow_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_ScreenToClientXY. Expected _wxWindow_p."); return NULL; } } @@ -1493,7 +1575,7 @@ static PyObject *_wrap_wxWindow_ScreenToClient(PyObject *self, PyObject *args) { temp0 = (int) PyInt_AsLong(_obj2); _arg2 = &temp0; } - wxWindow_ScreenToClient(_arg0,_arg1,_arg2); + wxWindow_ScreenToClientXY(_arg0,_arg1,_arg2); Py_INCREF(Py_None); _resultobj = Py_None; { @@ -2001,8 +2083,8 @@ static PyObject *_wrap_wxWindow_SetSizeHints(PyObject *self, PyObject *args) { return _resultobj; } -#define wxWindow_SetClientSize(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetClientSize(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args) { +#define wxWindow_SetClientSizeWH(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetClientSize(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxWindow_SetClientSizeWH(PyObject *self, PyObject *args) { PyObject * _resultobj; wxWindow * _arg0; int _arg1; @@ -2010,15 +2092,15 @@ static PyObject *_wrap_wxWindow_SetClientSize(PyObject *self, PyObject *args) { char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"sii:wxWindow_SetClientSize",&_argc0,&_arg1,&_arg2)) + if(!PyArg_ParseTuple(args,"sii:wxWindow_SetClientSizeWH",&_argc0,&_arg1,&_arg2)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetClientSize. Expected _wxWindow_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetClientSizeWH. Expected _wxWindow_p."); return NULL; } } - wxWindow_SetClientSize(_arg0,_arg1,_arg2); + wxWindow_SetClientSizeWH(_arg0,_arg1,_arg2); Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -2321,6 +2403,92 @@ static PyObject *_wrap_wxWindow_ConvertPixelSizeToDialog(PyObject *self, PyObjec return _resultobj; } +#define wxWindow_SetToolTipString(_swigobj,_swigarg0) (_swigobj->SetToolTip(_swigarg0)) +static PyObject *_wrap_wxWindow_SetToolTipString(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindow * _arg0; + wxString * _arg1; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sO:wxWindow_SetToolTipString",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetToolTipString. Expected _wxWindow_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + wxWindow_SetToolTipString(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxWindow_SetToolTip(_swigobj,_swigarg0) (_swigobj->SetToolTip(_swigarg0)) +static PyObject *_wrap_wxWindow_SetToolTip(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindow * _arg0; + wxToolTip * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxWindow_SetToolTip",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_SetToolTip. Expected _wxWindow_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxToolTip_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxWindow_SetToolTip. Expected _wxToolTip_p."); + return NULL; + } + } + wxWindow_SetToolTip(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxWindow_GetToolTip(_swigobj) (_swigobj->GetToolTip()) +static PyObject *_wrap_wxWindow_GetToolTip(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxToolTip * _result; + wxWindow * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxWindow_GetToolTip",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetToolTip. Expected _wxWindow_p."); + return NULL; + } + } + _result = (wxToolTip *)wxWindow_GetToolTip(_arg0); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxToolTip_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + static void *SwigwxPanelTowxWindow(void *ptr) { wxPanel *src; wxWindow *dest; @@ -4251,6 +4419,9 @@ static PyMethodDef windowscMethods[] = { { "new_wxDialog", _wrap_new_wxDialog, 1 }, { "wxPanel_InitDialog", _wrap_wxPanel_InitDialog, 1 }, { "new_wxPanel", _wrap_new_wxPanel, 1 }, + { "wxWindow_GetToolTip", _wrap_wxWindow_GetToolTip, 1 }, + { "wxWindow_SetToolTip", _wrap_wxWindow_SetToolTip, 1 }, + { "wxWindow_SetToolTipString", _wrap_wxWindow_SetToolTipString, 1 }, { "wxWindow_ConvertPixelSizeToDialog", _wrap_wxWindow_ConvertPixelSizeToDialog, 1 }, { "wxWindow_ConvertPixelPointToDialog", _wrap_wxWindow_ConvertPixelPointToDialog, 1 }, { "wxWindow_ConvertDialogSizeToPixels", _wrap_wxWindow_ConvertDialogSizeToPixels, 1 }, @@ -4262,7 +4433,7 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_Show", _wrap_wxWindow_Show, 1 }, { "wxWindow_SetTitle", _wrap_wxWindow_SetTitle, 1 }, { "wxWindow_SetCursor", _wrap_wxWindow_SetCursor, 1 }, - { "wxWindow_SetClientSize", _wrap_wxWindow_SetClientSize, 1 }, + { "wxWindow_SetClientSizeWH", _wrap_wxWindow_SetClientSizeWH, 1 }, { "wxWindow_SetSizeHints", _wrap_wxWindow_SetSizeHints, 1 }, { "wxWindow_SetPosition", _wrap_wxWindow_SetPosition, 1 }, { "wxWindow_SetSize", _wrap_wxWindow_SetSize, 1 }, @@ -4281,12 +4452,12 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_SetAutoLayout", _wrap_wxWindow_SetAutoLayout, 1 }, { "wxWindow_SetAcceleratorTable", _wrap_wxWindow_SetAcceleratorTable, 1 }, { "wxWindow_ScrollWindow", _wrap_wxWindow_ScrollWindow, 1 }, - { "wxWindow_ScreenToClient", _wrap_wxWindow_ScreenToClient, 1 }, + { "wxWindow_ScreenToClientXY", _wrap_wxWindow_ScreenToClientXY, 1 }, { "wxWindow_ReleaseMouse", _wrap_wxWindow_ReleaseMouse, 1 }, { "wxWindow_Refresh", _wrap_wxWindow_Refresh, 1 }, { "wxWindow_Raise", _wrap_wxWindow_Raise, 1 }, { "wxWindow_PopupMenu", _wrap_wxWindow_PopupMenu, 1 }, - { "wxWindow_Move", _wrap_wxWindow_Move, 1 }, + { "wxWindow_MoveXY", _wrap_wxWindow_MoveXY, 1 }, { "wxWindow_MakeModal", _wrap_wxWindow_MakeModal, 1 }, { "wxWindow_Lower", _wrap_wxWindow_Lower, 1 }, { "wxWindow_LoadFromResource", _wrap_wxWindow_LoadFromResource, 1 }, @@ -4297,6 +4468,7 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_InitDialog", _wrap_wxWindow_InitDialog, 1 }, { "wxWindow_GetWindowStyleFlag", _wrap_wxWindow_GetWindowStyleFlag, 1 }, { "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, 1 }, + { "wxWindow_GetFullTextExtent", _wrap_wxWindow_GetFullTextExtent, 1 }, { "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, 1 }, { "wxWindow_GetSize", _wrap_wxWindow_GetSize, 1 }, { "wxWindow_GetSizeTuple", _wrap_wxWindow_GetSizeTuple, 1 }, @@ -4322,12 +4494,12 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_GetBackgroundColour", _wrap_wxWindow_GetBackgroundColour, 1 }, { "wxWindow_Fit", _wrap_wxWindow_Fit, 1 }, { "wxWindow_FindWindowByName", _wrap_wxWindow_FindWindowByName, 1 }, - { "wxWindow_FindWindowByID", _wrap_wxWindow_FindWindowByID, 1 }, + { "wxWindow_FindWindowById", _wrap_wxWindow_FindWindowById, 1 }, { "wxWindow_Enable", _wrap_wxWindow_Enable, 1 }, { "wxWindow_DestroyChildren", _wrap_wxWindow_DestroyChildren, 1 }, { "wxWindow_Destroy", _wrap_wxWindow_Destroy, 1 }, { "wxWindow_Close", _wrap_wxWindow_Close, 1 }, - { "wxWindow_ClientToScreen", _wrap_wxWindow_ClientToScreen, 1 }, + { "wxWindow_ClientToScreenXY", _wrap_wxWindow_ClientToScreenXY, 1 }, { "wxWindow_Centre", _wrap_wxWindow_Centre, 1 }, { "wxWindow_Center", _wrap_wxWindow_Center, 1 }, { "wxWindow_CaptureMouse", _wrap_wxWindow_CaptureMouse, 1 }, @@ -4369,6 +4541,7 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); @@ -4376,6 +4549,7 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_long","_wxDash",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); + SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); @@ -4384,6 +4558,7 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_wxPanel","_class_wxDialog",SwigwxDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_wxDialog",SwigwxDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0); @@ -4459,6 +4634,7 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_short","_WXTYPE",0); SWIG_RegisterMapping("_short","_unsigned_short",0); SWIG_RegisterMapping("_short","_signed_short",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); SWIG_RegisterMapping("_wxWindowID","_uint",0); SWIG_RegisterMapping("_wxWindowID","_int",0); diff --git a/utils/wxPython/src/gtk/windows.py b/utils/wxPython/src/gtk/windows.py index b2b4bf1095..8f5bf466b7 100644 --- a/utils/wxPython/src/gtk/windows.py +++ b/utils/wxPython/src/gtk/windows.py @@ -10,7 +10,7 @@ def wxDLG_PNT(win, point): return win.ConvertDialogPointToPixels(point) def wxDLG_SZE(win, size): - return win.ConvertDialogPointToPixels(size) + return win.ConvertDialogSizeToPixels(size) class wxEvtHandlerPtr : def __init__(self,this): @@ -41,8 +41,8 @@ class wxWindowPtr(wxEvtHandlerPtr): def Centre(self,*args): val = apply(windowsc.wxWindow_Centre,(self.this,)+args) return val - def ClientToScreen(self,arg0,arg1): - val = windowsc.wxWindow_ClientToScreen(self.this,arg0,arg1) + def ClientToScreenXY(self,arg0,arg1): + val = windowsc.wxWindow_ClientToScreenXY(self.this,arg0,arg1) return val def Close(self,*args): val = apply(windowsc.wxWindow_Close,(self.this,)+args) @@ -56,8 +56,8 @@ class wxWindowPtr(wxEvtHandlerPtr): def Enable(self,arg0): val = windowsc.wxWindow_Enable(self.this,arg0) return val - def FindWindowByID(self,arg0): - val = windowsc.wxWindow_FindWindowByID(self.this,arg0) + def FindWindowById(self,arg0): + val = windowsc.wxWindow_FindWindowById(self.this,arg0) val = wxWindowPtr(val) return val def FindWindowByName(self,arg0): @@ -152,6 +152,13 @@ class wxWindowPtr(wxEvtHandlerPtr): def GetTextExtent(self,arg0): val = windowsc.wxWindow_GetTextExtent(self.this,arg0) return val + def GetFullTextExtent(self,arg0,*args): + argl = map(None,args) + try: argl[0] = argl[0].this + except: pass + args = tuple(argl) + val = apply(windowsc.wxWindow_GetFullTextExtent,(self.this,arg0,)+args) + return val def GetTitle(self): val = windowsc.wxWindow_GetTitle(self.this) return val @@ -182,8 +189,8 @@ class wxWindowPtr(wxEvtHandlerPtr): def MakeModal(self,arg0): val = windowsc.wxWindow_MakeModal(self.this,arg0) return val - def Move(self,arg0,arg1): - val = windowsc.wxWindow_Move(self.this,arg0,arg1) + def MoveXY(self,arg0,arg1): + val = windowsc.wxWindow_MoveXY(self.this,arg0,arg1) return val def PopupMenu(self,arg0,arg1,arg2): val = windowsc.wxWindow_PopupMenu(self.this,arg0.this,arg1,arg2) @@ -201,8 +208,8 @@ class wxWindowPtr(wxEvtHandlerPtr): def ReleaseMouse(self): val = windowsc.wxWindow_ReleaseMouse(self.this) return val - def ScreenToClient(self,arg0,arg1): - val = windowsc.wxWindow_ScreenToClient(self.this,arg0,arg1) + def ScreenToClientXY(self,arg0,arg1): + val = windowsc.wxWindow_ScreenToClientXY(self.this,arg0,arg1) return val def ScrollWindow(self,arg0,arg1,*args): argl = map(None,args) @@ -262,8 +269,8 @@ class wxWindowPtr(wxEvtHandlerPtr): def SetSizeHints(self,*args): val = apply(windowsc.wxWindow_SetSizeHints,(self.this,)+args) return val - def SetClientSize(self,arg0,arg1): - val = windowsc.wxWindow_SetClientSize(self.this,arg0,arg1) + def SetClientSizeWH(self,arg0,arg1): + val = windowsc.wxWindow_SetClientSizeWH(self.this,arg0,arg1) return val def SetCursor(self,arg0): val = windowsc.wxWindow_SetCursor(self.this,arg0.this) @@ -306,6 +313,16 @@ class wxWindowPtr(wxEvtHandlerPtr): val = wxSizePtr(val) val.thisown = 1 return val + def SetToolTipString(self,arg0): + val = windowsc.wxWindow_SetToolTipString(self.this,arg0) + return val + def SetToolTip(self,arg0): + val = windowsc.wxWindow_SetToolTip(self.this,arg0.this) + return val + def GetToolTip(self): + val = windowsc.wxWindow_GetToolTip(self.this) + val = wxToolTipPtr(val) + return val def __repr__(self): return "" class wxWindow(wxWindowPtr): diff --git a/utils/wxPython/src/gtk/windows2.cpp b/utils/wxPython/src/gtk/windows2.cpp index c15ddaa1a3..a97c35e700 100644 --- a/utils/wxPython/src/gtk/windows2.cpp +++ b/utils/wxPython/src/gtk/windows2.cpp @@ -2165,6 +2165,28 @@ static void *SwigwxGridEventTowxEvent(void *ptr) { return (void *) dest; } +#define wxGridEvent_m_row_set(_swigobj,_swigval) (_swigobj->m_row = _swigval,_swigval) +static PyObject *_wrap_wxGridEvent_m_row_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxGridEvent * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_row_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_row_set. Expected _wxGridEvent_p."); + return NULL; + } + } + _result = (int )wxGridEvent_m_row_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxGridEvent_m_row_get(_swigobj) ((int ) _swigobj->m_row) static PyObject *_wrap_wxGridEvent_m_row_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2186,6 +2208,28 @@ static PyObject *_wrap_wxGridEvent_m_row_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxGridEvent_m_col_set(_swigobj,_swigval) (_swigobj->m_col = _swigval,_swigval) +static PyObject *_wrap_wxGridEvent_m_col_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxGridEvent * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_col_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_col_set. Expected _wxGridEvent_p."); + return NULL; + } + } + _result = (int )wxGridEvent_m_col_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxGridEvent_m_col_get(_swigobj) ((int ) _swigobj->m_col) static PyObject *_wrap_wxGridEvent_m_col_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2207,6 +2251,28 @@ static PyObject *_wrap_wxGridEvent_m_col_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxGridEvent_m_x_set(_swigobj,_swigval) (_swigobj->m_x = _swigval,_swigval) +static PyObject *_wrap_wxGridEvent_m_x_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxGridEvent * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_x_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_x_set. Expected _wxGridEvent_p."); + return NULL; + } + } + _result = (int )wxGridEvent_m_x_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxGridEvent_m_x_get(_swigobj) ((int ) _swigobj->m_x) static PyObject *_wrap_wxGridEvent_m_x_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2228,6 +2294,28 @@ static PyObject *_wrap_wxGridEvent_m_x_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxGridEvent_m_y_set(_swigobj,_swigval) (_swigobj->m_y = _swigval,_swigval) +static PyObject *_wrap_wxGridEvent_m_y_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxGridEvent * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_y_set",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_y_set. Expected _wxGridEvent_p."); + return NULL; + } + } + _result = (int )wxGridEvent_m_y_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxGridEvent_m_y_get(_swigobj) ((int ) _swigobj->m_y) static PyObject *_wrap_wxGridEvent_m_y_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2249,6 +2337,30 @@ static PyObject *_wrap_wxGridEvent_m_y_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxGridEvent_m_control_set(_swigobj,_swigval) (_swigobj->m_control = _swigval,_swigval) +static PyObject *_wrap_wxGridEvent_m_control_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxGridEvent * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_control_set",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_control_set. Expected _wxGridEvent_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + _result = (bool )wxGridEvent_m_control_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxGridEvent_m_control_get(_swigobj) ((bool ) _swigobj->m_control) static PyObject *_wrap_wxGridEvent_m_control_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2270,6 +2382,30 @@ static PyObject *_wrap_wxGridEvent_m_control_get(PyObject *self, PyObject *args) return _resultobj; } +#define wxGridEvent_m_shift_set(_swigobj,_swigval) (_swigobj->m_shift = _swigval,_swigval) +static PyObject *_wrap_wxGridEvent_m_shift_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxGridEvent * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxGridEvent_m_shift_set",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_shift_set. Expected _wxGridEvent_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + _result = (bool )wxGridEvent_m_shift_set(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxGridEvent_m_shift_get(_swigobj) ((bool ) _swigobj->m_shift) static PyObject *_wrap_wxGridEvent_m_shift_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2291,6 +2427,37 @@ static PyObject *_wrap_wxGridEvent_m_shift_get(PyObject *self, PyObject *args) { return _resultobj; } +#define wxGridEvent_m_cell_set(_swigobj,_swigval) (_swigobj->m_cell = _swigval,_swigval) +static PyObject *_wrap_wxGridEvent_m_cell_set(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxGridCell * _result; + wxGridEvent * _arg0; + wxGridCell * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxGridEvent_m_cell_set",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridEvent_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGridEvent_m_cell_set. Expected _wxGridEvent_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxGridCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxGridEvent_m_cell_set. Expected _wxGridCell_p."); + return NULL; + } + } + _result = (wxGridCell *)wxGridEvent_m_cell_set(_arg0,_arg1); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxGridEvent_m_cell_get(_swigobj) ((wxGridCell *) _swigobj->m_cell) static PyObject *_wrap_wxGridEvent_m_cell_get(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3332,12 +3499,19 @@ static PyMethodDef windows2cMethods[] = { { "wxNotebookEvent_GetOldSelection", _wrap_wxNotebookEvent_GetOldSelection, 1 }, { "wxNotebookEvent_GetSelection", _wrap_wxNotebookEvent_GetSelection, 1 }, { "wxGridEvent_m_cell_get", _wrap_wxGridEvent_m_cell_get, 1 }, + { "wxGridEvent_m_cell_set", _wrap_wxGridEvent_m_cell_set, 1 }, { "wxGridEvent_m_shift_get", _wrap_wxGridEvent_m_shift_get, 1 }, + { "wxGridEvent_m_shift_set", _wrap_wxGridEvent_m_shift_set, 1 }, { "wxGridEvent_m_control_get", _wrap_wxGridEvent_m_control_get, 1 }, + { "wxGridEvent_m_control_set", _wrap_wxGridEvent_m_control_set, 1 }, { "wxGridEvent_m_y_get", _wrap_wxGridEvent_m_y_get, 1 }, + { "wxGridEvent_m_y_set", _wrap_wxGridEvent_m_y_set, 1 }, { "wxGridEvent_m_x_get", _wrap_wxGridEvent_m_x_get, 1 }, + { "wxGridEvent_m_x_set", _wrap_wxGridEvent_m_x_set, 1 }, { "wxGridEvent_m_col_get", _wrap_wxGridEvent_m_col_get, 1 }, + { "wxGridEvent_m_col_set", _wrap_wxGridEvent_m_col_set, 1 }, { "wxGridEvent_m_row_get", _wrap_wxGridEvent_m_row_get, 1 }, + { "wxGridEvent_m_row_set", _wrap_wxGridEvent_m_row_set, 1 }, { "wxGrid_UpdateDimensions", _wrap_wxGrid_UpdateDimensions, 1 }, { "wxGrid_SetRowHeight", _wrap_wxGrid_SetRowHeight, 1 }, { "wxGrid_SetLabelValue", _wrap_wxGrid_SetLabelValue, 1 }, @@ -3466,6 +3640,7 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); @@ -3479,6 +3654,7 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_long","_wxDash",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); + SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0); SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); @@ -3496,6 +3672,7 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0); SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0); @@ -3622,6 +3799,7 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0); SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0); SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); diff --git a/utils/wxPython/src/gtk/windows2.py b/utils/wxPython/src/gtk/windows2.py index c4c763bf68..021802e12c 100644 --- a/utils/wxPython/src/gtk/windows2.py +++ b/utils/wxPython/src/gtk/windows2.py @@ -402,10 +402,11 @@ class wxNotebookPtr(wxControlPtr): val = windows2c.wxNotebook_GetPageText(self.this,arg0) return val def SetImageList(self,arg0): - val = windows2c.wxNotebook_SetImageList(self.this,arg0) + val = windows2c.wxNotebook_SetImageList(self.this,arg0.this) return val def GetImageList(self): val = windows2c.wxNotebook_GetImageList(self.this) + val = wxImageListPtr(val) return val def GetPageImage(self,arg0): val = windows2c.wxNotebook_GetPageImage(self.this,arg0) diff --git a/utils/wxPython/src/gtk/windows3.cpp b/utils/wxPython/src/gtk/windows3.cpp index 18f25affe8..cde7a07876 100644 --- a/utils/wxPython/src/gtk/windows3.cpp +++ b/utils/wxPython/src/gtk/windows3.cpp @@ -1431,6 +1431,7 @@ SWIGEXPORT(void,initwindows3c)() { SWIG_RegisterMapping("_wxPaintEvent","_class_wxPaintEvent",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); @@ -1444,6 +1445,7 @@ SWIGEXPORT(void,initwindows3c)() { SWIG_RegisterMapping("_long","_wxDash",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); + SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0); SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0); SWIG_RegisterMapping("_wxSashWindow","_class_wxSashLayoutWindow",SwigwxSashLayoutWindowTowxSashWindow); @@ -1465,6 +1467,7 @@ SWIGEXPORT(void,initwindows3c)() { SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0); SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0); @@ -1607,6 +1610,7 @@ SWIGEXPORT(void,initwindows3c)() { SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0); SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); SWIG_RegisterMapping("_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0); SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0); diff --git a/utils/wxPython/src/gtk/wx.cpp b/utils/wxPython/src/gtk/wx.cpp index c6eff5bcca..6f51015886 100644 --- a/utils/wxPython/src/gtk/wx.cpp +++ b/utils/wxPython/src/gtk/wx.cpp @@ -33,8 +33,17 @@ * and things like that. * * $Log$ - * Revision 1.6 1999/02/01 00:17:51 RD - * Added the missing EVT_LIST_ITEM_SELECTED and friends. + * Revision 1.7 1999/02/20 10:01:33 RD + * Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a + * window handle. If you can get the window handle into the python code, + * it should just work... More news on this later. + * + * Added wxImageList, wxToolTip. + * + * Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the + * wxRegConfig class. + * + * As usual, some bug fixes, tweaks, etc. * ************************************************************************/ @@ -634,9 +643,22 @@ extern "C" SWIGEXPORT(void,initwindows3c)(); static int _wrap_wxPyDefaultPosition_set(PyObject *val) { + char * tval; + wxPoint * temp; - PyErr_SetString(PyExc_TypeError,"Variable wxPyDefaultPosition is read-only."); - return 1; + tval = (char *) PyString_AsString(val); + if (PyErr_Occurred()) { + PyErr_SetString(PyExc_TypeError,"C variable 'wxPyDefaultPosition'(wxPoint *)"); + return 1; + } + if (tval) { + if (SWIG_GetPtr(tval,(void **) &temp,"_wxPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultPosition. Expected _wxPoint_p."); + return 1; + } + } + wxPyDefaultPosition = *temp; + return 0; } static PyObject *_wrap_wxPyDefaultPosition_get() { @@ -649,9 +671,22 @@ static PyObject *_wrap_wxPyDefaultPosition_get() { } static int _wrap_wxPyDefaultSize_set(PyObject *val) { + char * tval; + wxSize * temp; - PyErr_SetString(PyExc_TypeError,"Variable wxPyDefaultSize is read-only."); - return 1; + tval = (char *) PyString_AsString(val); + if (PyErr_Occurred()) { + PyErr_SetString(PyExc_TypeError,"C variable 'wxPyDefaultSize'(wxSize *)"); + return 1; + } + if (tval) { + if (SWIG_GetPtr(tval,(void **) &temp,"_wxSize_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in value of wxPyDefaultSize. Expected _wxSize_p."); + return 1; + } + } + wxPyDefaultSize = *temp; + return 0; } static PyObject *_wrap_wxPyDefaultSize_get() { @@ -1542,6 +1577,7 @@ SWIGEXPORT(void,initwxc)() { PyDict_SetItemString(d,"false", PyInt_FromLong((long) 0)); PyDict_SetItemString(d,"TRUE", PyInt_FromLong((long) 1)); PyDict_SetItemString(d,"true", PyInt_FromLong((long) 1)); + PyDict_SetItemString(d,"wxVERSION_STRING", PyString_FromString("wxVERSION_STRING")); PyDict_SetItemString(d,"wxEVT_NULL", PyInt_FromLong((long) wxEVT_NULL)); PyDict_SetItemString(d,"wxEVT_FIRST", PyInt_FromLong((long) wxEVT_FIRST)); PyDict_SetItemString(d,"wxEVT_COMMAND_BUTTON_CLICKED", PyInt_FromLong((long) wxEVT_COMMAND_BUTTON_CLICKED)); @@ -1674,7 +1710,7 @@ SWIGEXPORT(void,initwxc)() { PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING)); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)); - PyDict_SetItemString(d,"__version__", PyString_FromString("0.5.4")); + PyDict_SetItemString(d,"__version__", PyString_FromString("2.0b5")); PyDict_SetItemString(d,"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set); SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set); @@ -1721,6 +1757,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxCursor","_class_wxCursor",0); SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0); + SWIG_RegisterMapping("_wxToolTip","_class_wxToolTip",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0); SWIG_RegisterMapping("_wxPageSetupData","_class_wxPageSetupData",0); @@ -1736,6 +1773,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_long","_wxDash",0); SWIG_RegisterMapping("_long","_unsigned_long",0); SWIG_RegisterMapping("_long","_signed_long",0); + SWIG_RegisterMapping("_wxImageList","_class_wxImageList",0); SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0); SWIG_RegisterMapping("_wxBitmapButton","_class_wxBitmapButton",0); SWIG_RegisterMapping("_wxSashWindow","_class_wxSashWindow",0); @@ -1757,6 +1795,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_wxInitDialogEvent","_class_wxInitDialogEvent",0); SWIG_RegisterMapping("_wxCheckBox","_class_wxCheckBox",0); SWIG_RegisterMapping("_wxTextCtrl","_class_wxTextCtrl",0); + SWIG_RegisterMapping("_class_wxToolTip","_wxToolTip",0); SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0); SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0); @@ -1907,6 +1946,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_class_wxChoice","_wxChoice",0); SWIG_RegisterMapping("_class_wxSlider","_wxSlider",0); SWIG_RegisterMapping("_class_wxCalculateLayoutEvent","_wxCalculateLayoutEvent",0); + SWIG_RegisterMapping("_class_wxImageList","_wxImageList",0); SWIG_RegisterMapping("_class_wxBitmapButton","_wxBitmapButton",0); SWIG_RegisterMapping("_wxFrame","_class_wxFrame",0); SWIG_RegisterMapping("_class_wxNotebook","_wxNotebook",0); diff --git a/utils/wxPython/src/gtk/wx.py b/utils/wxPython/src/gtk/wx.py index 9366ae8be5..d59a2cf353 100644 --- a/utils/wxPython/src/gtk/wx.py +++ b/utils/wxPython/src/gtk/wx.py @@ -480,6 +480,7 @@ FALSE = wxc.FALSE false = wxc.false TRUE = wxc.TRUE true = wxc.true +wxVERSION_STRING = wxc.wxVERSION_STRING wxEVT_NULL = wxc.wxEVT_NULL wxEVT_FIRST = wxc.wxEVT_FIRST wxEVT_COMMAND_BUTTON_CLICKED = wxc.wxEVT_COMMAND_BUTTON_CLICKED @@ -1170,6 +1171,15 @@ wxPyDefaultSize.Set(-1,-1) wxDefaultPosition = wxPyDefaultPosition wxDefaultSize = wxPyDefaultSize + +# This is to cover up a bug in SWIG. We are redefining +# the shadow class that is generated for wxAcceleratorTable +# because SWIG incorrectly uses "arg0.this" +class wxAcceleratorTable(wxAcceleratorTablePtr): + def __init__(self,arg0) : + self.this = miscc.new_wxAcceleratorTable(arg0) + self.thisown = 1 + #---------------------------------------------------------------------- ## class wxPyStdOutWindow(wxFrame): @@ -1237,8 +1247,29 @@ class wxApp(wxPyApp): #---------------------------------------------------------------------------- # # $Log$ -# Revision 1.5 1999/02/01 00:17:53 RD -# Added the missing EVT_LIST_ITEM_SELECTED and friends. +# Revision 1.6 1999/02/20 10:01:35 RD +# Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a +# window handle. If you can get the window handle into the python code, +# it should just work... More news on this later. +# +# Added wxImageList, wxToolTip. +# +# Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the +# wxRegConfig class. +# +# As usual, some bug fixes, tweaks, etc. +# +# Revision 1.11 1999/02/20 09:02:55 RD +# Added wxWindow_FromHWND(hWnd) for wxMSW to construct a wxWindow from a +# window handle. If you can get the window handle into the python code, +# it should just work... More news on this later. +# +# Added wxImageList, wxToolTip. +# +# Re-enabled wxConfig.DeleteAll() since it is reportedly fixed for the +# wxRegConfig class. +# +# As usual, some bug fixes, tweaks, etc. # # Revision 1.10 1999/02/01 00:10:39 RD # diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp index 9d4eb20f02..322425e7b7 100644 --- a/utils/wxPython/src/msw/gdi.cpp +++ b/utils/wxPython/src/msw/gdi.cpp @@ -5353,181 +5353,181 @@ static PyObject *_wrap_wxImageList_AddIcon(PyObject *self, PyObject *args) { return _resultobj; } -#define wxImageList_Draw(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->Draw(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) -static PyObject *_wrap_wxImageList_Draw(PyObject *self, PyObject *args) { +#define wxImageList_Replace(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->Replace(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxImageList_Replace(PyObject *self, PyObject *args) { PyObject * _resultobj; bool _result; wxImageList * _arg0; int _arg1; - wxDC * _arg2; - int _arg3; - int _arg4; - int _arg5 = (wxIMAGELIST_DRAW_NORMAL); - bool _arg6 = (0); + wxBitmap * _arg2; + wxBitmap * _arg3 = &wxNullBitmap; char * _argc0 = 0; char * _argc2 = 0; - int tempbool6; + char * _argc3 = 0; self = self; - if(!PyArg_ParseTuple(args,"sisii|ii:wxImageList_Draw",&_argc0,&_arg1,&_argc2,&_arg3,&_arg4,&_arg5,&tempbool6)) + if(!PyArg_ParseTuple(args,"sis|s:wxImageList_Replace",&_argc0,&_arg1,&_argc2,&_argc3)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Draw. Expected _wxImageList_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Replace. Expected _wxImageList_p."); return NULL; } } if (_argc2) { - if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxDC_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Draw. Expected _wxDC_p."); + if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Replace. Expected _wxBitmap_p."); return NULL; } } - _arg6 = (bool ) tempbool6; - _result = (bool )wxImageList_Draw(_arg0,_arg1,*_arg2,_arg3,_arg4,_arg5,_arg6); + if (_argc3) { + if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxImageList_Replace. Expected _wxBitmap_p."); + return NULL; + } + } + _result = (bool )wxImageList_Replace(_arg0,_arg1,*_arg2,*_arg3); _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxImageList_GetImageCount(_swigobj) (_swigobj->GetImageCount()) -static PyObject *_wrap_wxImageList_GetImageCount(PyObject *self, PyObject *args) { +#define wxImageList_ReplaceIcon(_swigobj,_swigarg0,_swigarg1) (_swigobj->Replace(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxImageList_ReplaceIcon(PyObject *self, PyObject *args) { PyObject * _resultobj; - int _result; + bool _result; wxImageList * _arg0; + int _arg1; + wxIcon * _arg2; char * _argc0 = 0; + char * _argc2 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxImageList_GetImageCount",&_argc0)) + if(!PyArg_ParseTuple(args,"sis:wxImageList_ReplaceIcon",&_argc0,&_arg1,&_argc2)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_GetImageCount. Expected _wxImageList_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_ReplaceIcon. Expected _wxImageList_p."); return NULL; } } - _result = (int )wxImageList_GetImageCount(_arg0); + if (_argc2) { + if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_ReplaceIcon. Expected _wxIcon_p."); + return NULL; + } + } + _result = (bool )wxImageList_ReplaceIcon(_arg0,_arg1,*_arg2); _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxImageList_Remove(_swigobj,_swigarg0) (_swigobj->Remove(_swigarg0)) -static PyObject *_wrap_wxImageList_Remove(PyObject *self, PyObject *args) { +#define wxImageList_Draw(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (_swigobj->Draw(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_wxImageList_Draw(PyObject *self, PyObject *args) { PyObject * _resultobj; bool _result; wxImageList * _arg0; int _arg1; + wxDC * _arg2; + int _arg3; + int _arg4; + int _arg5 = (wxIMAGELIST_DRAW_NORMAL); + bool _arg6 = (0); char * _argc0 = 0; + char * _argc2 = 0; + int tempbool6; self = self; - if(!PyArg_ParseTuple(args,"si:wxImageList_Remove",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"sisii|ii:wxImageList_Draw",&_argc0,&_arg1,&_argc2,&_arg3,&_arg4,&_arg5,&tempbool6)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Remove. Expected _wxImageList_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Draw. Expected _wxImageList_p."); return NULL; } } - _result = (bool )wxImageList_Remove(_arg0,_arg1); + if (_argc2) { + if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxDC_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Draw. Expected _wxDC_p."); + return NULL; + } + } + _arg6 = (bool ) tempbool6; + _result = (bool )wxImageList_Draw(_arg0,_arg1,*_arg2,_arg3,_arg4,_arg5,_arg6); _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxImageList_RemoveAll(_swigobj) (_swigobj->RemoveAll()) -static PyObject *_wrap_wxImageList_RemoveAll(PyObject *self, PyObject *args) { +#define wxImageList_GetImageCount(_swigobj) (_swigobj->GetImageCount()) +static PyObject *_wrap_wxImageList_GetImageCount(PyObject *self, PyObject *args) { PyObject * _resultobj; - bool _result; + int _result; wxImageList * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxImageList_RemoveAll",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxImageList_GetImageCount",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_RemoveAll. Expected _wxImageList_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_GetImageCount. Expected _wxImageList_p."); return NULL; } } - _result = (bool )wxImageList_RemoveAll(_arg0); + _result = (int )wxImageList_GetImageCount(_arg0); _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxImageList_Replace(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->Replace(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxImageList_Replace(PyObject *self, PyObject *args) { +#define wxImageList_Remove(_swigobj,_swigarg0) (_swigobj->Remove(_swigarg0)) +static PyObject *_wrap_wxImageList_Remove(PyObject *self, PyObject *args) { PyObject * _resultobj; bool _result; wxImageList * _arg0; int _arg1; - wxBitmap * _arg2; - wxBitmap * _arg3 = &wxNullBitmap; char * _argc0 = 0; - char * _argc2 = 0; - char * _argc3 = 0; self = self; - if(!PyArg_ParseTuple(args,"sis|s:wxImageList_Replace",&_argc0,&_arg1,&_argc2,&_argc3)) + if(!PyArg_ParseTuple(args,"si:wxImageList_Remove",&_argc0,&_arg1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Replace. Expected _wxImageList_p."); - return NULL; - } - } - if (_argc2) { - if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_Replace. Expected _wxBitmap_p."); - return NULL; - } - } - if (_argc3) { - if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxImageList_Replace. Expected _wxBitmap_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_Remove. Expected _wxImageList_p."); return NULL; } } - _result = (bool )wxImageList_Replace(_arg0,_arg1,*_arg2,*_arg3); + _result = (bool )wxImageList_Remove(_arg0,_arg1); _resultobj = Py_BuildValue("i",_result); return _resultobj; } -#define wxImageList_ReplaceIcon(_swigobj,_swigarg0,_swigarg1) (_swigobj->Replace(_swigarg0,_swigarg1)) -static PyObject *_wrap_wxImageList_ReplaceIcon(PyObject *self, PyObject *args) { +#define wxImageList_RemoveAll(_swigobj) (_swigobj->RemoveAll()) +static PyObject *_wrap_wxImageList_RemoveAll(PyObject *self, PyObject *args) { PyObject * _resultobj; bool _result; wxImageList * _arg0; - int _arg1; - wxIcon * _arg2; char * _argc0 = 0; - char * _argc2 = 0; self = self; - if(!PyArg_ParseTuple(args,"sis:wxImageList_ReplaceIcon",&_argc0,&_arg1,&_argc2)) + if(!PyArg_ParseTuple(args,"s:wxImageList_RemoveAll",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxImageList_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_ReplaceIcon. Expected _wxImageList_p."); - return NULL; - } - } - if (_argc2) { - if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxIcon_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxImageList_ReplaceIcon. Expected _wxIcon_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImageList_RemoveAll. Expected _wxImageList_p."); return NULL; } } - _result = (bool )wxImageList_ReplaceIcon(_arg0,_arg1,*_arg2); + _result = (bool )wxImageList_RemoveAll(_arg0); _resultobj = Py_BuildValue("i",_result); return _resultobj; } static PyMethodDef gdicMethods[] = { - { "wxImageList_ReplaceIcon", _wrap_wxImageList_ReplaceIcon, 1 }, - { "wxImageList_Replace", _wrap_wxImageList_Replace, 1 }, { "wxImageList_RemoveAll", _wrap_wxImageList_RemoveAll, 1 }, { "wxImageList_Remove", _wrap_wxImageList_Remove, 1 }, { "wxImageList_GetImageCount", _wrap_wxImageList_GetImageCount, 1 }, { "wxImageList_Draw", _wrap_wxImageList_Draw, 1 }, + { "wxImageList_ReplaceIcon", _wrap_wxImageList_ReplaceIcon, 1 }, + { "wxImageList_Replace", _wrap_wxImageList_Replace, 1 }, { "wxImageList_AddIcon", _wrap_wxImageList_AddIcon, 1 }, { "wxImageList_AddWithColourMask", _wrap_wxImageList_AddWithColourMask, 1 }, { "wxImageList_Add", _wrap_wxImageList_Add, 1 }, diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py index 841322538c..ca04475c3e 100644 --- a/utils/wxPython/src/msw/gdi.py +++ b/utils/wxPython/src/msw/gdi.py @@ -735,6 +735,16 @@ class wxImageListPtr : def AddIcon(self,arg0): val = gdic.wxImageList_AddIcon(self.this,arg0.this) return val + def Replace(self,arg0,arg1,*args): + argl = map(None,args) + try: argl[0] = argl[0].this + except: pass + args = tuple(argl) + val = apply(gdic.wxImageList_Replace,(self.this,arg0,arg1.this,)+args) + return val + def ReplaceIcon(self,arg0,arg1): + val = gdic.wxImageList_ReplaceIcon(self.this,arg0,arg1.this) + return val def Draw(self,arg0,arg1,arg2,arg3,*args): val = apply(gdic.wxImageList_Draw,(self.this,arg0,arg1.this,arg2,arg3,)+args) return val @@ -747,16 +757,6 @@ class wxImageListPtr : def RemoveAll(self): val = gdic.wxImageList_RemoveAll(self.this) return val - def Replace(self,arg0,arg1,*args): - argl = map(None,args) - try: argl[0] = argl[0].this - except: pass - args = tuple(argl) - val = apply(gdic.wxImageList_Replace,(self.this,arg0,arg1.this,)+args) - return val - def ReplaceIcon(self,arg0,arg1): - val = gdic.wxImageList_ReplaceIcon(self.this,arg0,arg1.this) - return val def __repr__(self): return "" class wxImageList(wxImageListPtr): -- 2.45.2