X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9c039d08bfbb59c0abcbc705fb49f9b2cb321edf..ad813b00d5956f35f2b1585a276095e24ce8ad5a:/utils/wxPython/src/msw/controls.cpp diff --git a/utils/wxPython/src/msw/controls.cpp b/utils/wxPython/src/msw/controls.cpp index f530d32a0f..f69bf210a6 100644 --- a/utils/wxPython/src/msw/controls.cpp +++ b/utils/wxPython/src/msw/controls.cpp @@ -55,14 +55,18 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include +#include #ifdef __WXMSW__ -#include #if wxUSE_OWNER_DRAWN #include #endif #endif +#ifdef __WXGTK__ +#include +#endif + static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; if (!target) { @@ -110,15 +114,14 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { } +extern byte* byte_LIST_helper(PyObject* source); extern int* int_LIST_helper(PyObject* source); extern long* long_LIST_helper(PyObject* source); extern char** string_LIST_helper(PyObject* source); extern wxPoint* wxPoint_LIST_helper(PyObject* source); extern wxBitmap** wxBitmap_LIST_helper(PyObject* source); extern wxString* wxString_LIST_helper(PyObject* source); -#ifdef __WXMSW__ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); -#endif static char* wxStringErrorMsg = "string type is required for parameter"; @@ -3744,23 +3747,23 @@ static PyObject *_wrap_wxScrollBar_GetPageSize(PyObject *self, PyObject *args) { return _resultobj; } -#define wxScrollBar_GetPosition(_swigobj) (_swigobj->GetPosition()) -static PyObject *_wrap_wxScrollBar_GetPosition(PyObject *self, PyObject *args) { +#define wxScrollBar_GetThumbPosition(_swigobj) (_swigobj->GetThumbPosition()) +static PyObject *_wrap_wxScrollBar_GetThumbPosition(PyObject *self, PyObject *args) { PyObject * _resultobj; int _result; wxScrollBar * _arg0; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"s:wxScrollBar_GetPosition",&_argc0)) + if(!PyArg_ParseTuple(args,"s:wxScrollBar_GetThumbPosition",&_argc0)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetPosition. Expected _wxScrollBar_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_GetThumbPosition. Expected _wxScrollBar_p."); return NULL; } } - _result = (int )wxScrollBar_GetPosition(_arg0); + _result = (int )wxScrollBar_GetThumbPosition(_arg0); _resultobj = Py_BuildValue("i",_result); return _resultobj; } @@ -3786,23 +3789,23 @@ static PyObject *_wrap_wxScrollBar_GetThumbSize(PyObject *self, PyObject *args) return _resultobj; } -#define wxScrollBar_SetPosition(_swigobj,_swigarg0) (_swigobj->SetPosition(_swigarg0)) -static PyObject *_wrap_wxScrollBar_SetPosition(PyObject *self, PyObject *args) { +#define wxScrollBar_SetThumbPosition(_swigobj,_swigarg0) (_swigobj->SetThumbPosition(_swigarg0)) +static PyObject *_wrap_wxScrollBar_SetThumbPosition(PyObject *self, PyObject *args) { PyObject * _resultobj; wxScrollBar * _arg0; int _arg1; char * _argc0 = 0; self = self; - if(!PyArg_ParseTuple(args,"si:wxScrollBar_SetPosition",&_argc0,&_arg1)) + if(!PyArg_ParseTuple(args,"si:wxScrollBar_SetThumbPosition",&_argc0,&_arg1)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxScrollBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_SetPosition. Expected _wxScrollBar_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxScrollBar_SetThumbPosition. Expected _wxScrollBar_p."); return NULL; } } - wxScrollBar_SetPosition(_arg0,_arg1); + wxScrollBar_SetThumbPosition(_arg0,_arg1); Py_INCREF(Py_None); _resultobj = Py_None; return _resultobj; @@ -5315,9 +5318,9 @@ static PyMethodDef controlscMethods[] = { { "wxSpinButton_GetMax", _wrap_wxSpinButton_GetMax, 1 }, { "new_wxSpinButton", _wrap_new_wxSpinButton, 1 }, { "wxScrollBar_SetScrollbar", _wrap_wxScrollBar_SetScrollbar, 1 }, - { "wxScrollBar_SetPosition", _wrap_wxScrollBar_SetPosition, 1 }, + { "wxScrollBar_SetThumbPosition", _wrap_wxScrollBar_SetThumbPosition, 1 }, { "wxScrollBar_GetThumbSize", _wrap_wxScrollBar_GetThumbSize, 1 }, - { "wxScrollBar_GetPosition", _wrap_wxScrollBar_GetPosition, 1 }, + { "wxScrollBar_GetThumbPosition", _wrap_wxScrollBar_GetThumbPosition, 1 }, { "wxScrollBar_GetPageSize", _wrap_wxScrollBar_GetPageSize, 1 }, { "wxScrollBar_GetRange", _wrap_wxScrollBar_GetRange, 1 }, { "new_wxScrollBar", _wrap_new_wxScrollBar, 1 }, @@ -5452,6 +5455,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxActivateEvent","_wxActivateEvent",0); SWIG_RegisterMapping("_signed_long","_long",0); SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0); + SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0); SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSlider",SwigwxSliderTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxSlider",SwigwxSliderTowxEvtHandler); @@ -5493,6 +5497,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); @@ -5504,21 +5509,23 @@ 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); SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); + SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_wxPrinterDC","_class_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); - SWIG_RegisterMapping("_class_wxPostScriptDC","_wxPostScriptDC",0); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); 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); @@ -5542,6 +5549,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0); SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); + SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0); SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0); SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); @@ -5551,6 +5559,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_EBool","_signed_int",0); SWIG_RegisterMapping("_EBool","_int",0); SWIG_RegisterMapping("_EBool","_wxWindowID",0); + SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0); SWIG_RegisterMapping("_class_wxDropFilesEvent","_wxDropFilesEvent",0); SWIG_RegisterMapping("_wxStaticText","_class_wxStaticText",0); SWIG_RegisterMapping("_wxFont","_class_wxFont",0); @@ -5636,11 +5645,11 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_signed_short","_short",0); SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0); SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0); + SWIG_RegisterMapping("_class_wxWindowDC","_wxWindowDC",0); SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0); SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0); SWIG_RegisterMapping("_class_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); - SWIG_RegisterMapping("_wxPostScriptDC","_class_wxPostScriptDC",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); SWIG_RegisterMapping("_class_wxMetaFileDC","_wxMetaFileDC",0); @@ -5698,6 +5707,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); @@ -5710,10 +5720,12 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_int","_unsigned_int",0); SWIG_RegisterMapping("_int","_signed_int",0); SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0); + SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0); SWIG_RegisterMapping("_wxButton","_class_wxBitmapButton",SwigwxBitmapButtonTowxButton); SWIG_RegisterMapping("_wxButton","_wxBitmapButton",SwigwxBitmapButtonTowxButton); SWIG_RegisterMapping("_wxButton","_class_wxButton",0); SWIG_RegisterMapping("_wxSize","_class_wxSize",0); + SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0); SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0); SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0); @@ -5761,9 +5773,11 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0); SWIG_RegisterMapping("_class_wxColour","_wxColour",0); SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0); + SWIG_RegisterMapping("_wxPalette","_class_wxPalette",0); SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0); SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0); SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0); + SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0); SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0); SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0); SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0); @@ -5819,6 +5833,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0); SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0); SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0); + SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0); SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0); SWIG_RegisterMapping("_wxWindow","_class_wxSlider",SwigwxSliderTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxSlider",SwigwxSliderTowxWindow);