From 62bd087498a21a9e49723bd85c8d8a2ab71c4c35 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 16 Nov 1998 00:01:43 +0000 Subject: [PATCH] Generic treectrl for wxPython/GTK compiles... git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1004 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/src/_extras.py | 19 +++ utils/wxPython/src/controls.i | 7 +- utils/wxPython/src/controls2.i | 12 ++ utils/wxPython/src/events.i | 11 ++ utils/wxPython/src/gtk/controls.cpp | 198 ++++++++++++++++++++++++++- utils/wxPython/src/gtk/controls.py | 35 +++++ utils/wxPython/src/gtk/controls2.cpp | 20 ++- utils/wxPython/src/gtk/events.cpp | 39 ++++++ utils/wxPython/src/gtk/events.py | 13 ++ utils/wxPython/src/gtk/frames.cpp | 4 + utils/wxPython/src/gtk/mdi.cpp | 4 + utils/wxPython/src/gtk/stattool.cpp | 4 + utils/wxPython/src/gtk/windows2.cpp | 4 + utils/wxPython/src/gtk/wxp.cpp | 16 ++- utils/wxPython/src/gtk/wxp.py | 20 ++- 15 files changed, 386 insertions(+), 20 deletions(-) diff --git a/utils/wxPython/src/_extras.py b/utils/wxPython/src/_extras.py index 089a250387..1034e5e210 100644 --- a/utils/wxPython/src/_extras.py +++ b/utils/wxPython/src/_extras.py @@ -392,6 +392,22 @@ def EVT_TREE_DELETE_ITEM(win, id, func): +def EVT_SPIN_UP(win, id, func): + win.Connect(id, -1, wxEVT_SCROLL_LINEUP, func) + +def EVT_SPIN_DOWN(win, id, func): + win.Connect(id, -1,wxEVT_SCROLL_LINEDOWN, func) + +def EVT_SPIN(win, id, func): + win.Connect(id, -1, wxEVT_SCROLL_TOP, func) + win.Connect(id, -1, wxEVT_SCROLL_BOTTOM, func) + win.Connect(id, -1, wxEVT_SCROLL_LINEUP, func) + win.Connect(id, -1, wxEVT_SCROLL_LINEDOWN, func) + win.Connect(id, -1, wxEVT_SCROLL_PAGEUP, func) + win.Connect(id, -1, wxEVT_SCROLL_PAGEDOWN, func) + win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK,func) + + #---------------------------------------------------------------------- @@ -487,6 +503,9 @@ class wxApp(wxPyApp): #---------------------------------------------------------------------------- # # $Log$ +# Revision 1.6 1998/11/16 00:00:52 RD +# Generic treectrl for wxPython/GTK compiles... +# # Revision 1.5 1998/10/20 07:38:02 RD # bug fix # diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i index c0b0bf8096..27401be2c6 100644 --- a/utils/wxPython/src/controls.i +++ b/utils/wxPython/src/controls.i @@ -15,9 +15,9 @@ %{ #include "helpers.h" #include +#include #ifdef __WXMSW__ -#include #if wxUSE_OWNER_DRAWN #include #endif @@ -356,7 +356,6 @@ public: //---------------------------------------------------------------------- -#ifdef __WXMSW__ class wxSpinButton : public wxControl { public: wxSpinButton(wxWindow* parent, wxWindowID id = -1, @@ -371,7 +370,6 @@ public: void SetRange(int min, int max); void SetValue(int value); }; -#endif //---------------------------------------------------------------------- @@ -485,6 +483,9 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.7 1998/11/16 00:00:53 RD +// Generic treectrl for wxPython/GTK compiles... +// // Revision 1.6 1998/11/15 23:03:43 RD // Removing some ifdef's for wxGTK // diff --git a/utils/wxPython/src/controls2.i b/utils/wxPython/src/controls2.i index 56dcdaaae3..a1f55bbe82 100644 --- a/utils/wxPython/src/controls2.i +++ b/utils/wxPython/src/controls2.i @@ -226,6 +226,7 @@ public: class wxTreeCtrl : public wxControl { public: +#ifdef __WXMSW__ wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, const wxPoint& pos = wxPyDefaultPosition, const wxSize& size = wxPyDefaultSize, @@ -233,6 +234,14 @@ public: const wxValidator& validator = wxPyDefaultValidator, char* name = "wxTreeCtrl"); +#else + wxTreeCtrl(wxWindow *parent, wxWindowID id = -1, + const wxPoint& pos = wxPyDefaultPosition, + const wxSize& size = wxPyDefaultSize, + long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT, + //const wxValidator& validator = wxPyDefaultValidator, + char* name = "wxTreeCtrl"); +#endif %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" size_t GetCount(); @@ -375,6 +384,9 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.9 1998/11/16 00:00:54 RD +// Generic treectrl for wxPython/GTK compiles... +// // Revision 1.8 1998/11/11 04:40:20 RD // wxTreeCtrl now works (sort of) for wxPython-GTK. This is the new // TreeCtrl in src/gtk/treectrl.cpp not the old generic one. diff --git a/utils/wxPython/src/events.i b/utils/wxPython/src/events.i index c0b1586ea2..c3f8e0039a 100644 --- a/utils/wxPython/src/events.i +++ b/utils/wxPython/src/events.i @@ -15,6 +15,7 @@ %{ #include "helpers.h" +#include %} //---------------------------------------------------------------------- @@ -85,6 +86,13 @@ public: //--------------------------------------------------------------------------- +class wxSpinEvent : public wxScrollEvent { +public: + +}; + +//--------------------------------------------------------------------------- + class wxMouseEvent: public wxEvent { public: bool IsButton(); @@ -289,6 +297,9 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.4 1998/11/16 00:00:55 RD +// Generic treectrl for wxPython/GTK compiles... +// // Revision 1.3 1998/10/20 06:43:56 RD // New wxTreeCtrl wrappers (untested) // some changes in helpers diff --git a/utils/wxPython/src/gtk/controls.cpp b/utils/wxPython/src/gtk/controls.cpp index d6eb68def5..190082e8a4 100644 --- a/utils/wxPython/src/gtk/controls.cpp +++ b/utils/wxPython/src/gtk/controls.cpp @@ -55,9 +55,9 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include +#include #ifdef __WXMSW__ -#include #if wxUSE_OWNER_DRAWN #include #endif @@ -3510,6 +3510,180 @@ static PyObject *_wrap_wxScrollBar_SetScrollbar(PyObject *self, PyObject *args) return _resultobj; } +static void *SwigwxSpinButtonTowxControl(void *ptr) { + wxSpinButton *src; + wxControl *dest; + src = (wxSpinButton *) ptr; + dest = (wxControl *) src; + return (void *) dest; +} + +static void *SwigwxSpinButtonTowxWindow(void *ptr) { + wxSpinButton *src; + wxWindow *dest; + src = (wxSpinButton *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxSpinButtonTowxEvtHandler(void *ptr) { + wxSpinButton *src; + wxEvtHandler *dest; + src = (wxSpinButton *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +#define new_wxSpinButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxSpinButton(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +static PyObject *_wrap_new_wxSpinButton(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxSpinButton * _result; + wxWindow * _arg0; + wxWindowID _arg1 = -1; + wxPoint * _arg2 = &wxPyDefaultPosition; + wxSize * _arg3 = &wxPyDefaultSize; + long _arg4 = (wxSP_HORIZONTAL); + char * _arg5 = "spinButton"; + char * _argc0 = 0; + char * _argc2 = 0; + char * _argc3 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s|issls:new_wxSpinButton",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxSpinButton. Expected _wxWindow_p."); + return NULL; + } + } + if (_argc2) { + if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxSpinButton. Expected _wxPoint_p."); + return NULL; + } + } + if (_argc3) { + if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxSpinButton. Expected _wxSize_p."); + return NULL; + } + } + _result = (wxSpinButton *)new_wxSpinButton(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxSpinButton_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxSpinButton_GetMax(_swigobj) (_swigobj->GetMax()) +static PyObject *_wrap_wxSpinButton_GetMax(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxSpinButton * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxSpinButton_GetMax",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSpinButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_GetMax. Expected _wxSpinButton_p."); + return NULL; + } + } + _result = (int )wxSpinButton_GetMax(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxSpinButton_GetMin(_swigobj) (_swigobj->GetMin()) +static PyObject *_wrap_wxSpinButton_GetMin(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxSpinButton * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxSpinButton_GetMin",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSpinButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_GetMin. Expected _wxSpinButton_p."); + return NULL; + } + } + _result = (int )wxSpinButton_GetMin(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxSpinButton_GetValue(_swigobj) (_swigobj->GetValue()) +static PyObject *_wrap_wxSpinButton_GetValue(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxSpinButton * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxSpinButton_GetValue",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSpinButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_GetValue. Expected _wxSpinButton_p."); + return NULL; + } + } + _result = (int )wxSpinButton_GetValue(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxSpinButton_SetRange(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetRange(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxSpinButton_SetRange(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxSpinButton * _arg0; + int _arg1; + int _arg2; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sii:wxSpinButton_SetRange",&_argc0,&_arg1,&_arg2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSpinButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_SetRange. Expected _wxSpinButton_p."); + return NULL; + } + } + wxSpinButton_SetRange(_arg0,_arg1,_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxSpinButton_SetValue(_swigobj,_swigarg0) (_swigobj->SetValue(_swigarg0)) +static PyObject *_wrap_wxSpinButton_SetValue(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxSpinButton * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxSpinButton_SetValue",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSpinButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSpinButton_SetValue. Expected _wxSpinButton_p."); + return NULL; + } + } + wxSpinButton_SetValue(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + static void *SwigwxStaticBitmapTowxControl(void *ptr) { wxStaticBitmap *src; wxControl *dest; @@ -4781,6 +4955,12 @@ static PyMethodDef controlscMethods[] = { { "wxStaticBitmap_SetBitmap", _wrap_wxStaticBitmap_SetBitmap, 1 }, { "wxStaticBitmap_GetBitmap", _wrap_wxStaticBitmap_GetBitmap, 1 }, { "new_wxStaticBitmap", _wrap_new_wxStaticBitmap, 1 }, + { "wxSpinButton_SetValue", _wrap_wxSpinButton_SetValue, 1 }, + { "wxSpinButton_SetRange", _wrap_wxSpinButton_SetRange, 1 }, + { "wxSpinButton_GetValue", _wrap_wxSpinButton_GetValue, 1 }, + { "wxSpinButton_GetMin", _wrap_wxSpinButton_GetMin, 1 }, + { "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_GetThumbSize", _wrap_wxScrollBar_GetThumbSize, 1 }, @@ -4918,6 +5098,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxEvtHandler","_wxRadioBox",SwigwxRadioBoxTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStaticBitmap",SwigwxStaticBitmapTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxStaticBitmap",SwigwxStaticBitmapTowxEvtHandler); + SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSpinButton",SwigwxSpinButtonTowxEvtHandler); + SWIG_RegisterMapping("_class_wxEvtHandler","_wxSpinButton",SwigwxSpinButtonTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxScrollBar",SwigwxScrollBarTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxScrollBar",SwigwxScrollBarTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler); @@ -4962,6 +5144,7 @@ SWIGEXPORT(void,initcontrolsc)() { 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("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -4994,6 +5177,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0); + SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0); SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0); @@ -5012,6 +5196,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0); SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0); SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0); + SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0); SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0); SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0); @@ -5040,6 +5225,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxWindow","_wxRadioBox",SwigwxRadioBoxTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_class_wxStaticBitmap",SwigwxStaticBitmapTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxStaticBitmap",SwigwxStaticBitmapTowxWindow); + SWIG_RegisterMapping("_class_wxWindow","_class_wxSpinButton",SwigwxSpinButtonTowxWindow); + SWIG_RegisterMapping("_class_wxWindow","_wxSpinButton",SwigwxSpinButtonTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_class_wxScrollBar",SwigwxScrollBarTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxScrollBar",SwigwxScrollBarTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_class_wxTextCtrl",SwigwxTextCtrlTowxWindow); @@ -5094,6 +5281,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxControl","_wxRadioBox",SwigwxRadioBoxTowxControl); SWIG_RegisterMapping("_wxControl","_class_wxStaticBitmap",SwigwxStaticBitmapTowxControl); SWIG_RegisterMapping("_wxControl","_wxStaticBitmap",SwigwxStaticBitmapTowxControl); + SWIG_RegisterMapping("_wxControl","_class_wxSpinButton",SwigwxSpinButtonTowxControl); + SWIG_RegisterMapping("_wxControl","_wxSpinButton",SwigwxSpinButtonTowxControl); SWIG_RegisterMapping("_wxControl","_class_wxScrollBar",SwigwxScrollBarTowxControl); SWIG_RegisterMapping("_wxControl","_wxScrollBar",SwigwxScrollBarTowxControl); SWIG_RegisterMapping("_wxControl","_class_wxTextCtrl",SwigwxTextCtrlTowxControl); @@ -5145,6 +5334,7 @@ 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); @@ -5164,6 +5354,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxControl","_wxRadioBox",SwigwxRadioBoxTowxControl); SWIG_RegisterMapping("_class_wxControl","_class_wxStaticBitmap",SwigwxStaticBitmapTowxControl); SWIG_RegisterMapping("_class_wxControl","_wxStaticBitmap",SwigwxStaticBitmapTowxControl); + SWIG_RegisterMapping("_class_wxControl","_class_wxSpinButton",SwigwxSpinButtonTowxControl); + SWIG_RegisterMapping("_class_wxControl","_wxSpinButton",SwigwxSpinButtonTowxControl); SWIG_RegisterMapping("_class_wxControl","_class_wxScrollBar",SwigwxScrollBarTowxControl); SWIG_RegisterMapping("_class_wxControl","_wxScrollBar",SwigwxScrollBarTowxControl); SWIG_RegisterMapping("_class_wxControl","_class_wxTextCtrl",SwigwxTextCtrlTowxControl); @@ -5212,6 +5404,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxEvtHandler","_wxRadioBox",SwigwxRadioBoxTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxStaticBitmap",SwigwxStaticBitmapTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxStaticBitmap",SwigwxStaticBitmapTowxEvtHandler); + SWIG_RegisterMapping("_wxEvtHandler","_class_wxSpinButton",SwigwxSpinButtonTowxEvtHandler); + SWIG_RegisterMapping("_wxEvtHandler","_wxSpinButton",SwigwxSpinButtonTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxScrollBar",SwigwxScrollBarTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxScrollBar",SwigwxScrollBarTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler); @@ -5253,6 +5447,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxWindow","_wxRadioBox",SwigwxRadioBoxTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxStaticBitmap",SwigwxStaticBitmapTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxStaticBitmap",SwigwxStaticBitmapTowxWindow); + SWIG_RegisterMapping("_wxWindow","_class_wxSpinButton",SwigwxSpinButtonTowxWindow); + SWIG_RegisterMapping("_wxWindow","_wxSpinButton",SwigwxSpinButtonTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxScrollBar",SwigwxScrollBarTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxScrollBar",SwigwxScrollBarTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxTextCtrl",SwigwxTextCtrlTowxWindow); diff --git a/utils/wxPython/src/gtk/controls.py b/utils/wxPython/src/gtk/controls.py index 06ceb33fb5..a64d77d667 100644 --- a/utils/wxPython/src/gtk/controls.py +++ b/utils/wxPython/src/gtk/controls.py @@ -544,6 +544,41 @@ class wxScrollBar(wxScrollBarPtr): +class wxSpinButtonPtr(wxControlPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetMax(self): + val = controlsc.wxSpinButton_GetMax(self.this) + return val + def GetMin(self): + val = controlsc.wxSpinButton_GetMin(self.this) + return val + def GetValue(self): + val = controlsc.wxSpinButton_GetValue(self.this) + return val + def SetRange(self,arg0,arg1): + val = controlsc.wxSpinButton_SetRange(self.this,arg0,arg1) + return val + def SetValue(self,arg0): + val = controlsc.wxSpinButton_SetValue(self.this,arg0) + return val + def __repr__(self): + return "" +class wxSpinButton(wxSpinButtonPtr): + def __init__(self,arg0,*args) : + argl = map(None,args) + try: argl[1] = argl[1].this + except: pass + try: argl[2] = argl[2].this + except: pass + args = tuple(argl) + self.this = apply(controlsc.new_wxSpinButton,(arg0.this,)+args) + self.thisown = 1 + + + + class wxStaticBitmapPtr(wxControlPtr): def __init__(self,this): self.this = this diff --git a/utils/wxPython/src/gtk/controls2.cpp b/utils/wxPython/src/gtk/controls2.cpp index 66fd98783f..52f5782e12 100644 --- a/utils/wxPython/src/gtk/controls2.cpp +++ b/utils/wxPython/src/gtk/controls2.cpp @@ -2084,7 +2084,7 @@ static void *SwigwxTreeCtrlTowxEvtHandler(void *ptr) { return (void *) dest; } -#define new_wxTreeCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxTreeCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6)) +#define new_wxTreeCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxTreeCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) { PyObject * _resultobj; wxTreeCtrl * _result; @@ -2093,16 +2093,14 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) { wxPoint * _arg2 = &wxPyDefaultPosition; wxSize * _arg3 = &wxPyDefaultSize; long _arg4 = (wxTR_HAS_BUTTONS)|(wxTR_LINES_AT_ROOT); - wxValidator * _arg5 = &wxPyDefaultValidator; - char * _arg6 = "wxTreeCtrl"; + char * _arg5 = "wxTreeCtrl"; char * _argc0 = 0; char * _argc2 = 0; char * _argc3 = 0; - char * _argc5 = 0; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s|isslss:new_wxTreeCtrl",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_argc5,&_arg6)) + if(!PyArg_ParseTuple(args,"s|issls:new_wxTreeCtrl",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { @@ -2122,13 +2120,7 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) { return NULL; } } - if (_argc5) { - if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxValidator_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxTreeCtrl. Expected _wxValidator_p."); - return NULL; - } - } - _result = (wxTreeCtrl *)new_wxTreeCtrl(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5,_arg6); + _result = (wxTreeCtrl *)new_wxTreeCtrl(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeCtrl_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -3743,6 +3735,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_class_wxGauge","_wxGauge",0); SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_wxListEvent","_class_wxListEvent",0); + SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -3782,6 +3775,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0); + SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0); SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0); @@ -3802,6 +3796,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0); SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0); SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0); + SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0); SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0); SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0); @@ -3885,6 +3880,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_int","_signed_int",0); SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0); SWIG_RegisterMapping("_class_wxListEvent","_wxListEvent",0); + SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0); SWIG_RegisterMapping("_wxButton","_class_wxButton",0); SWIG_RegisterMapping("_wxSize","_class_wxSize",0); SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0); diff --git a/utils/wxPython/src/gtk/events.cpp b/utils/wxPython/src/gtk/events.cpp index f821dcd57c..d98ad63dbf 100644 --- a/utils/wxPython/src/gtk/events.cpp +++ b/utils/wxPython/src/gtk/events.cpp @@ -54,6 +54,7 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "eventsc" #include "helpers.h" +#include static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -681,6 +682,30 @@ static PyObject *_wrap_wxScrollEvent_GetPosition(PyObject *self, PyObject *args) return _resultobj; } +static void *SwigwxSpinEventTowxScrollEvent(void *ptr) { + wxSpinEvent *src; + wxScrollEvent *dest; + src = (wxSpinEvent *) ptr; + dest = (wxScrollEvent *) src; + return (void *) dest; +} + +static void *SwigwxSpinEventTowxCommandEvent(void *ptr) { + wxSpinEvent *src; + wxCommandEvent *dest; + src = (wxSpinEvent *) ptr; + dest = (wxCommandEvent *) src; + return (void *) dest; +} + +static void *SwigwxSpinEventTowxEvent(void *ptr) { + wxSpinEvent *src; + wxEvent *dest; + src = (wxSpinEvent *) ptr; + dest = (wxEvent *) src; + return (void *) dest; +} + static void *SwigwxMouseEventTowxEvent(void *ptr) { wxMouseEvent *src; wxEvent *dest; @@ -2668,6 +2693,8 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_wxEvent","_wxKeyEvent",SwigwxKeyEventTowxEvent); SWIG_RegisterMapping("_wxEvent","_class_wxMouseEvent",SwigwxMouseEventTowxEvent); SWIG_RegisterMapping("_wxEvent","_wxMouseEvent",SwigwxMouseEventTowxEvent); + SWIG_RegisterMapping("_wxEvent","_class_wxSpinEvent",SwigwxSpinEventTowxEvent); + SWIG_RegisterMapping("_wxEvent","_wxSpinEvent",SwigwxSpinEventTowxEvent); SWIG_RegisterMapping("_wxEvent","_class_wxScrollEvent",SwigwxScrollEventTowxEvent); SWIG_RegisterMapping("_wxEvent","_wxScrollEvent",SwigwxScrollEventTowxEvent); SWIG_RegisterMapping("_wxEvent","_class_wxCommandEvent",SwigwxCommandEventTowxEvent); @@ -2688,6 +2715,7 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_long","_signed_long",0); SWIG_RegisterMapping("_wxDropFilesEvent","_class_wxDropFilesEvent",0); SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); + SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); SWIG_RegisterMapping("_wxSysColourChangedEvent","_class_wxSysColourChangedEvent",0); @@ -2733,6 +2761,8 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_class_wxEvent","_wxKeyEvent",SwigwxKeyEventTowxEvent); SWIG_RegisterMapping("_class_wxEvent","_class_wxMouseEvent",SwigwxMouseEventTowxEvent); SWIG_RegisterMapping("_class_wxEvent","_wxMouseEvent",SwigwxMouseEventTowxEvent); + SWIG_RegisterMapping("_class_wxEvent","_class_wxSpinEvent",SwigwxSpinEventTowxEvent); + SWIG_RegisterMapping("_class_wxEvent","_wxSpinEvent",SwigwxSpinEventTowxEvent); SWIG_RegisterMapping("_class_wxEvent","_class_wxScrollEvent",SwigwxScrollEventTowxEvent); SWIG_RegisterMapping("_class_wxEvent","_wxScrollEvent",SwigwxScrollEventTowxEvent); SWIG_RegisterMapping("_class_wxEvent","_class_wxCommandEvent",SwigwxCommandEventTowxEvent); @@ -2743,6 +2773,8 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_class_wxEvent","_wxSizeEvent",SwigwxSizeEventTowxEvent); SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0); SWIG_RegisterMapping("_wxRect","_class_wxRect",0); + SWIG_RegisterMapping("_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent); + SWIG_RegisterMapping("_wxCommandEvent","_wxSpinEvent",SwigwxSpinEventTowxCommandEvent); SWIG_RegisterMapping("_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent); SWIG_RegisterMapping("_wxCommandEvent","_wxScrollEvent",SwigwxScrollEventTowxCommandEvent); SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0); @@ -2751,6 +2783,8 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0); + SWIG_RegisterMapping("_wxScrollEvent","_class_wxSpinEvent",SwigwxSpinEventTowxScrollEvent); + SWIG_RegisterMapping("_wxScrollEvent","_wxSpinEvent",SwigwxSpinEventTowxScrollEvent); SWIG_RegisterMapping("_wxScrollEvent","_class_wxScrollEvent",0); SWIG_RegisterMapping("_EBool","_signed_int",0); SWIG_RegisterMapping("_EBool","_int",0); @@ -2790,6 +2824,8 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_short","_WXTYPE",0); SWIG_RegisterMapping("_short","_unsigned_short",0); SWIG_RegisterMapping("_short","_signed_short",0); + SWIG_RegisterMapping("_class_wxScrollEvent","_class_wxSpinEvent",SwigwxSpinEventTowxScrollEvent); + SWIG_RegisterMapping("_class_wxScrollEvent","_wxSpinEvent",SwigwxSpinEventTowxScrollEvent); SWIG_RegisterMapping("_class_wxScrollEvent","_wxScrollEvent",0); SWIG_RegisterMapping("_wxJoystickEvent","_class_wxJoystickEvent",0); SWIG_RegisterMapping("_wxWindowID","_EBool",0); @@ -2803,6 +2839,7 @@ SWIGEXPORT(void,initeventsc)() { 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("_wxSize","_class_wxSize",0); SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0); SWIG_RegisterMapping("_class_wxInitDialogEvent","_wxInitDialogEvent",0); @@ -2813,6 +2850,8 @@ SWIGEXPORT(void,initeventsc)() { SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0); SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0); SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0); + SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxSpinEvent",SwigwxSpinEventTowxCommandEvent); + SWIG_RegisterMapping("_class_wxCommandEvent","_wxSpinEvent",SwigwxSpinEventTowxCommandEvent); SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxScrollEvent",SwigwxScrollEventTowxCommandEvent); SWIG_RegisterMapping("_class_wxCommandEvent","_wxScrollEvent",SwigwxScrollEventTowxCommandEvent); SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0); diff --git a/utils/wxPython/src/gtk/events.py b/utils/wxPython/src/gtk/events.py index 130c95edbb..7d20bbc827 100644 --- a/utils/wxPython/src/gtk/events.py +++ b/utils/wxPython/src/gtk/events.py @@ -141,6 +141,19 @@ class wxScrollEvent(wxScrollEventPtr): +class wxSpinEventPtr(wxScrollEventPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "" +class wxSpinEvent(wxSpinEventPtr): + def __init__(self,this): + self.this = this + + + + class wxMouseEventPtr(wxEventPtr): def __init__(self,this): self.this = this diff --git a/utils/wxPython/src/gtk/frames.cpp b/utils/wxPython/src/gtk/frames.cpp index 8c3189a698..564006d6c1 100644 --- a/utils/wxPython/src/gtk/frames.cpp +++ b/utils/wxPython/src/gtk/frames.cpp @@ -741,6 +741,7 @@ SWIGEXPORT(void,initframesc)() { 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("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -773,6 +774,7 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0); + SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0); SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0); @@ -793,6 +795,7 @@ SWIGEXPORT(void,initframesc)() { SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0); SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0); SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0); + SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0); SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0); SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0); @@ -869,6 +872,7 @@ SWIGEXPORT(void,initframesc)() { 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_wxButton",0); SWIG_RegisterMapping("_wxSize","_class_wxSize",0); SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0); diff --git a/utils/wxPython/src/gtk/mdi.cpp b/utils/wxPython/src/gtk/mdi.cpp index 376beffcf5..47a7b27f78 100644 --- a/utils/wxPython/src/gtk/mdi.cpp +++ b/utils/wxPython/src/gtk/mdi.cpp @@ -748,6 +748,7 @@ SWIGEXPORT(void,initmdic)() { 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("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -780,6 +781,7 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0); + SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0); SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0); @@ -802,6 +804,7 @@ SWIGEXPORT(void,initmdic)() { SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0); SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0); SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0); + SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0); SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0); SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0); @@ -888,6 +891,7 @@ SWIGEXPORT(void,initmdic)() { 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_wxButton",0); SWIG_RegisterMapping("_wxSize","_class_wxSize",0); SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0); diff --git a/utils/wxPython/src/gtk/stattool.cpp b/utils/wxPython/src/gtk/stattool.cpp index 99748a23fc..74158eafaf 100644 --- a/utils/wxPython/src/gtk/stattool.cpp +++ b/utils/wxPython/src/gtk/stattool.cpp @@ -1153,6 +1153,7 @@ SWIGEXPORT(void,initstattoolc)() { 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("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -1185,6 +1186,7 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0); + SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0); SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0); @@ -1205,6 +1207,7 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0); SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0); SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0); + SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0); SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0); SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0); @@ -1284,6 +1287,7 @@ SWIGEXPORT(void,initstattoolc)() { 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_wxButton",0); SWIG_RegisterMapping("_wxSize","_class_wxSize",0); SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0); diff --git a/utils/wxPython/src/gtk/windows2.cpp b/utils/wxPython/src/gtk/windows2.cpp index 7c01e5c3af..a7e72d2212 100644 --- a/utils/wxPython/src/gtk/windows2.cpp +++ b/utils/wxPython/src/gtk/windows2.cpp @@ -3146,6 +3146,7 @@ SWIGEXPORT(void,initwindows2c)() { 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("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -3184,6 +3185,7 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0); + SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_class_wxIconizeEvent","_wxIconizeEvent",0); SWIG_RegisterMapping("_class_wxStaticBitmap","_wxStaticBitmap",0); @@ -3203,6 +3205,7 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0); SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0); SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0); + SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0); SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxPanel","_class_wxGrid",SwigwxGridTowxPanel); SWIG_RegisterMapping("_class_wxPanel","_wxGrid",SwigwxGridTowxPanel); @@ -3287,6 +3290,7 @@ SWIGEXPORT(void,initwindows2c)() { 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_wxButton",0); SWIG_RegisterMapping("_wxSize","_class_wxSize",0); SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0); diff --git a/utils/wxPython/src/gtk/wxp.cpp b/utils/wxPython/src/gtk/wxp.cpp index 1e2bda4299..16a3d71fd3 100644 --- a/utils/wxPython/src/gtk/wxp.cpp +++ b/utils/wxPython/src/gtk/wxp.cpp @@ -33,8 +33,8 @@ * and things like that. * * $Log$ - * Revision 1.8 1998/11/15 23:04:56 RD - * Removing some ifdef's for wxGTK + * Revision 1.9 1998/11/16 00:01:41 RD + * Generic treectrl for wxPython/GTK compiles... * ************************************************************************/ @@ -1719,6 +1719,7 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_class_wxTreeCtrl","_wxTreeCtrl",0); SWIG_RegisterMapping("_wxMask","_class_wxMask",0); SWIG_RegisterMapping("_wxGrid","_class_wxGrid",0); + SWIG_RegisterMapping("_wxPageSetupData","_class_wxPageSetupData",0); SWIG_RegisterMapping("_wxPyMenu","_class_wxPyMenu",0); SWIG_RegisterMapping("_class_wxColourData","_wxColourData",0); SWIG_RegisterMapping("_wxPen","_class_wxPen",0); @@ -1738,6 +1739,7 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_wxDC","_class_wxDC",0); SWIG_RegisterMapping("_wxListEvent","_class_wxListEvent",0); SWIG_RegisterMapping("_class_wxSingleChoiceDialog","_wxSingleChoiceDialog",0); + SWIG_RegisterMapping("_wxSpinEvent","_class_wxSpinEvent",0); SWIG_RegisterMapping("_class_wxRealPoint","_wxRealPoint",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); SWIG_RegisterMapping("_class_wxPaintEvent","_wxPaintEvent",0); @@ -1751,8 +1753,10 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_class_wxMask","_wxMask",0); SWIG_RegisterMapping("_class_wxKeyEvent","_wxKeyEvent",0); SWIG_RegisterMapping("_class_wxGrid","_wxGrid",0); + SWIG_RegisterMapping("_class_wxPageSetupData","_wxPageSetupData",0); SWIG_RegisterMapping("_wxColour","_class_wxColour",0); SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0); + SWIG_RegisterMapping("_wxPageSetupDialog","_class_wxPageSetupDialog",0); SWIG_RegisterMapping("_wxIdleEvent","_class_wxIdleEvent",0); SWIG_RegisterMapping("_class_wxUpdateUIEvent","_wxUpdateUIEvent",0); SWIG_RegisterMapping("_wxToolBar","_class_wxToolBar",0); @@ -1772,10 +1776,13 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_wxTreeItemData","_class_wxTreeItemData",0); SWIG_RegisterMapping("_class_wxFontData","_wxFontData",0); SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); + SWIG_RegisterMapping("_wxPrintDialog","_class_wxPrintDialog",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); SWIG_RegisterMapping("_wxScrollBar","_class_wxScrollBar",0); + SWIG_RegisterMapping("_wxSpinButton","_class_wxSpinButton",0); SWIG_RegisterMapping("_wxToolBarTool","_class_wxToolBarTool",0); SWIG_RegisterMapping("_wxColourDialog","_class_wxColourDialog",0); + SWIG_RegisterMapping("_wxPrintData","_class_wxPrintData",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_wxMessageDialog","_class_wxMessageDialog",0); SWIG_RegisterMapping("_wxTextEntryDialog","_class_wxTextEntryDialog",0); @@ -1803,6 +1810,7 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0); SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0); SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0); + SWIG_RegisterMapping("_class_wxSpinButton","_wxSpinButton",0); SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0); SWIG_RegisterMapping("_class_wxCheckBox","_wxCheckBox",0); @@ -1844,6 +1852,7 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_signed_short","_WXTYPE",0); SWIG_RegisterMapping("_signed_short","_short",0); SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0); + SWIG_RegisterMapping("_class_wxPrintDialog","_wxPrintDialog",0); SWIG_RegisterMapping("_wxPaintDC","_class_wxPaintDC",0); SWIG_RegisterMapping("_class_wxFocusEvent","_wxFocusEvent",0); SWIG_RegisterMapping("_class_wxMaximizeEvent","_wxMaximizeEvent",0); @@ -1890,6 +1899,7 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_int","_signed_int",0); SWIG_RegisterMapping("_class_wxMouseEvent","_wxMouseEvent",0); SWIG_RegisterMapping("_class_wxListEvent","_wxListEvent",0); + SWIG_RegisterMapping("_class_wxSpinEvent","_wxSpinEvent",0); SWIG_RegisterMapping("_wxButton","_class_wxButton",0); SWIG_RegisterMapping("_class_wxPyApp","_wxPyApp",0); SWIG_RegisterMapping("_wxSize","_class_wxSize",0); @@ -1908,6 +1918,7 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_class_wxIcon","_wxIcon",0); SWIG_RegisterMapping("_class_wxColour","_wxColour",0); SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0); + SWIG_RegisterMapping("_class_wxPageSetupDialog","_wxPageSetupDialog",0); SWIG_RegisterMapping("_class_wxIdleEvent","_wxIdleEvent",0); SWIG_RegisterMapping("_wxEraseEvent","_class_wxEraseEvent",0); SWIG_RegisterMapping("_class_wxJoystickEvent","_wxJoystickEvent",0); @@ -1933,6 +1944,7 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_wxMenuItem","_class_wxMenuItem",0); SWIG_RegisterMapping("_class_wxScrollBar","_wxScrollBar",0); SWIG_RegisterMapping("_class_wxColourDialog","_wxColourDialog",0); + SWIG_RegisterMapping("_class_wxPrintData","_wxPrintData",0); SWIG_RegisterMapping("_wxDash","_unsigned_long",0); SWIG_RegisterMapping("_wxDash","_long",0); SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0); diff --git a/utils/wxPython/src/gtk/wxp.py b/utils/wxPython/src/gtk/wxp.py index 1cbda2e568..2c48ba9de8 100644 --- a/utils/wxPython/src/gtk/wxp.py +++ b/utils/wxPython/src/gtk/wxp.py @@ -1014,6 +1014,22 @@ def EVT_TREE_DELETE_ITEM(win, id, func): +def EVT_SPIN_UP(win, id, func): + win.Connect(id, -1, wxEVT_SCROLL_LINEUP, func) + +def EVT_SPIN_DOWN(win, id, func): + win.Connect(id, -1,wxEVT_SCROLL_LINEDOWN, func) + +def EVT_SPIN(win, id, func): + win.Connect(id, -1, wxEVT_SCROLL_TOP, func) + win.Connect(id, -1, wxEVT_SCROLL_BOTTOM, func) + win.Connect(id, -1, wxEVT_SCROLL_LINEUP, func) + win.Connect(id, -1, wxEVT_SCROLL_LINEDOWN, func) + win.Connect(id, -1, wxEVT_SCROLL_PAGEUP, func) + win.Connect(id, -1, wxEVT_SCROLL_PAGEDOWN, func) + win.Connect(id, -1, wxEVT_SCROLL_THUMBTRACK,func) + + #---------------------------------------------------------------------- @@ -1109,8 +1125,8 @@ class wxApp(wxPyApp): #---------------------------------------------------------------------------- # # $Log$ -# Revision 1.8 1998/11/15 23:04:59 RD -# Removing some ifdef's for wxGTK +# Revision 1.9 1998/11/16 00:01:43 RD +# Generic treectrl for wxPython/GTK compiles... # # Revision 1.5 1998/10/20 07:38:02 RD # bug fix -- 2.47.2