From b639c3c5ef53c4bdefd3b27aac1496787f024cb8 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 25 Nov 1998 08:47:28 +0000 Subject: [PATCH] Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon Added events for wxGrid Other various fixes and additions git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1044 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/src/_extras.py | 66 ++- utils/wxPython/src/cmndlgs.i | 7 +- utils/wxPython/src/controls2.i | 10 +- utils/wxPython/src/gdi.i | 29 ++ utils/wxPython/src/helpers.cpp | 28 ++ utils/wxPython/src/helpers.h | 8 + utils/wxPython/src/misc.i | 57 +++ utils/wxPython/src/msw/cmndlgs.cpp | 11 +- utils/wxPython/src/msw/cmndlgs.py | 1 + utils/wxPython/src/msw/controls.cpp | 11 +- utils/wxPython/src/msw/controls2.cpp | 64 +-- utils/wxPython/src/msw/controls2.py | 6 - utils/wxPython/src/msw/events.cpp | 42 +- utils/wxPython/src/msw/events.py | 13 + utils/wxPython/src/msw/frames.cpp | 9 +- utils/wxPython/src/msw/gdi.cpp | 213 ++++++++- utils/wxPython/src/msw/gdi.py | 49 +- utils/wxPython/src/msw/mdi.cpp | 9 +- utils/wxPython/src/msw/misc.cpp | 590 +++++++++++++++++++++++- utils/wxPython/src/msw/misc.py | 101 ++++ utils/wxPython/src/msw/stattool.cpp | 9 +- utils/wxPython/src/msw/windows.cpp | 7 +- utils/wxPython/src/msw/windows2.cpp | 462 ++++++++++++++++++- utils/wxPython/src/msw/windows2.py | 130 +++++- utils/wxPython/src/msw/wxp.cpp | 23 +- utils/wxPython/src/msw/wxp.py | 84 +++- utils/wxPython/src/my_typemaps.i | 17 + utils/wxPython/src/windows2.i | 123 +++-- utils/wxPython/tests/bitmaps/smiles.ico | Bin 0 -> 766 bytes utils/wxPython/tests/test4.py | 28 +- utils/wxPython/tests/test5.py | 99 ++++ 31 files changed, 2170 insertions(+), 136 deletions(-) create mode 100644 utils/wxPython/tests/bitmaps/smiles.ico create mode 100644 utils/wxPython/tests/test5.py diff --git a/utils/wxPython/src/_extras.py b/utils/wxPython/src/_extras.py index 1034e5e210..2e8d7d96a8 100644 --- a/utils/wxPython/src/_extras.py +++ b/utils/wxPython/src/_extras.py @@ -347,7 +347,7 @@ def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, func) -#wxTreeCtrl events +# wxTreeCtrl events def EVT_TREE_BEGIN_DRAG(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_DRAG, func) @@ -391,7 +391,7 @@ def EVT_TREE_DELETE_ITEM(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TREE_DELETE_ITEM, func) - +# wxSpinButton def EVT_SPIN_UP(win, id, func): win.Connect(id, -1, wxEVT_SCROLL_LINEUP, func) @@ -409,6 +409,61 @@ def EVT_SPIN(win, id, func): + +# wxTaskBarIcon +def EVT_TASKBAR_MOVE(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_MOVE, func) + +def EVT_TASKBAR_LEFT_DOWN(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DOWN, func) + +def EVT_TASKBAR_LEFT_UP(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_UP, func) + +def EVT_TASKBAR_RIGHT_DOWN(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DOWN, func) + +def EVT_TASKBAR_RIGHT_UP(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_UP, func) + +def EVT_TASKBAR_LEFT_DCLICK(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DCLICK, func) + +def EVT_TASKBAR_RIGHT_DCLICK(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func) + + +# wxGrid +def EVT_GRID_SELECT_CELL(win, fn): + win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn) + +def EVT_GRID_CREATE_CELL(win, fn): + win.Connect(-1, -1, wxEVT_GRID_CREATE_CELL, fn) + +def EVT_GRID_CHANGE_LABELS(win, fn): + win.Connect(-1, -1, wxEVT_GRID_CHANGE_LABELS, fn) + +def EVT_GRID_CHANGE_SEL_LABEL(win, fn): + win.Connect(-1, -1, wxEVT_GRID_CHANGE_SEL_LABEL, fn) + +def EVT_GRID_CELL_CHANGE(win, fn): + win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn) + +def EVT_GRID_CELL_LCLICK(win, fn): + win.Connect(-1, -1, wxEVT_GRID_CELL_LCLICK, fn) + +def EVT_GRID_CELL_RCLICK(win, fn): + win.Connect(-1, -1, wxEVT_GRID_CELL_RCLICK, fn) + +def EVT_GRID_LABEL_LCLICK(win, fn): + win.Connect(-1, -1, wxEVT_GRID_LABEL_LCLICK, fn) + +def EVT_GRID_LABEL_RCLICK(win, fn): + win.Connect(-1, -1, wxEVT_GRID_LABEL_RCLICK, fn) + + + + #---------------------------------------------------------------------- class wxTimer(wxPyTimer): @@ -430,7 +485,7 @@ NULL = NullObj() #---------------------------------------------------------------------- # aliases -wxColor = wxColour +wxColor = wxColour wxNamedColor = wxNamedColour wxPyDefaultPosition.Set(-1,-1) @@ -503,6 +558,11 @@ class wxApp(wxPyApp): #---------------------------------------------------------------------------- # # $Log$ +# Revision 1.7 1998/11/25 08:45:21 RD +# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon +# Added events for wxGrid +# Other various fixes and additions +# # Revision 1.6 1998/11/16 00:00:52 RD # Generic treectrl for wxPython/GTK compiles... # diff --git a/utils/wxPython/src/cmndlgs.i b/utils/wxPython/src/cmndlgs.i index 56e22d9d1a..3ec7bd1ece 100644 --- a/utils/wxPython/src/cmndlgs.i +++ b/utils/wxPython/src/cmndlgs.i @@ -285,7 +285,7 @@ public: %pragma(python) addtomethod = "__init__:wxp._StdDialogCallbacks(self)" wxPrintData& GetPrintData(); - wxDC* GetPrintDC(); + %new wxDC* GetPrintDC(); int ShowModal(); }; @@ -310,6 +310,11 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.6 1998/11/25 08:45:22 RD +// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon +// Added events for wxGrid +// Other various fixes and additions +// // Revision 1.5 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 a1f55bbe82..62a0203f29 100644 --- a/utils/wxPython/src/controls2.i +++ b/utils/wxPython/src/controls2.i @@ -16,9 +16,6 @@ #include "helpers.h" #include #include -#if 0 -#include -#endif %} //---------------------------------------------------------------------- @@ -181,7 +178,6 @@ public: //---------------------------------------------------------------------- -//#ifdef __WXMSW__ class wxTreeItemId { public: wxTreeItemId(); @@ -322,7 +318,6 @@ public: }; -//#endif //---------------------------------------------------------------------- @@ -384,6 +379,11 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.10 1998/11/25 08:45:23 RD +// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon +// Added events for wxGrid +// Other various fixes and additions +// // Revision 1.9 1998/11/16 00:00:54 RD // Generic treectrl for wxPython/GTK compiles... // diff --git a/utils/wxPython/src/gdi.i b/utils/wxPython/src/gdi.i index 5750c6a26e..f4166abfb6 100644 --- a/utils/wxPython/src/gdi.i +++ b/utils/wxPython/src/gdi.i @@ -402,6 +402,15 @@ public: //--------------------------------------------------------------------------- +#ifdef __WXMSW__ +class wxWindowDC : public wxDC { +public: + wxWindowDC(wxWindow* win); +}; +#endif + +//--------------------------------------------------------------------------- + #ifndef __WXMSW__ class wxPostScriptDC : public wxDC { public: @@ -482,11 +491,31 @@ extern wxPalette wxNullPalette; extern wxFont wxNullFont; extern wxColour wxNullColour; +//--------------------------------------------------------------------------- + +class wxPalette { +public: + wxPalette(int LCOUNT, byte* LIST, byte* LIST, byte* LIST); + ~wxPalette(); + + int GetPixel(byte red, byte green, byte blue); + bool GetRGB(int pixel, byte* OUTPUT, byte* OUTPUT, byte* OUTPUT); + bool Ok(); +}; + +//--------------------------------------------------------------------------- + + //--------------------------------------------------------------------------- ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.6 1998/11/25 08:45:24 RD +// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon +// Added events for wxGrid +// Other various fixes and additions +// // Revision 1.5 1998/10/20 06:43:57 RD // New wxTreeCtrl wrappers (untested) // some changes in helpers diff --git a/utils/wxPython/src/helpers.cpp b/utils/wxPython/src/helpers.cpp index a89b3502e8..8ffbd7931a 100644 --- a/utils/wxPython/src/helpers.cpp +++ b/utils/wxPython/src/helpers.cpp @@ -370,6 +370,29 @@ void wxPyTimer::Notify() { // imcluded in every file... +byte* byte_LIST_helper(PyObject* source) { + if (!PyList_Check(source)) { + PyErr_SetString(PyExc_TypeError, "Expected a list object."); + return NULL; + } + int count = PyList_Size(source); + byte* temp = new byte[count]; + if (! temp) { + PyErr_SetString(PyExc_MemoryError, "Unable to allocate temporary array"); + return NULL; + } + for (int x=0; x +#include #ifdef __WXMSW__ -#include #if wxUSE_OWNER_DRAWN #include #endif @@ -110,15 +110,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"; @@ -5509,6 +5508,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("_wxPrinterDC","_class_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); @@ -5541,6 +5541,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); @@ -5635,6 +5636,7 @@ 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); @@ -5708,6 +5710,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); @@ -5759,6 +5762,7 @@ 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); @@ -5817,6 +5821,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); diff --git a/utils/wxPython/src/msw/controls2.cpp b/utils/wxPython/src/msw/controls2.cpp index 6894a78887..15d39d486d 100644 --- a/utils/wxPython/src/msw/controls2.cpp +++ b/utils/wxPython/src/msw/controls2.cpp @@ -56,9 +56,6 @@ extern PyObject *SWIG_newvarlink(void); #include "helpers.h" #include #include -#if 0 -#include -#endif static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -107,15 +104,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"; @@ -2010,27 +2006,6 @@ static PyObject *_wrap_wxTreeItemId_IsOk(PyObject *self, PyObject *args) { return _resultobj; } -static long wxTreeItemId_GetId(wxTreeItemId *self) { return (long)(*self); } -static PyObject *_wrap_wxTreeItemId_GetId(PyObject *self, PyObject *args) { - PyObject * _resultobj; - long _result; - wxTreeItemId * _arg0; - char * _argc0 = 0; - - self = self; - if(!PyArg_ParseTuple(args,"s:wxTreeItemId_GetId",&_argc0)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeItemId_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeItemId_GetId. Expected _wxTreeItemId_p."); - return NULL; - } - } - _result = (long )wxTreeItemId_GetId(_arg0); - _resultobj = Py_BuildValue("l",_result); - return _resultobj; -} - #define new_wxTreeItemData() (new wxTreeItemData()) static PyObject *_wrap_new_wxTreeItemData(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3755,37 +3730,7 @@ static PyObject *_wrap_wxTreeCtrl_EndEditLabel(PyObject *self, PyObject *args) { return _resultobj; } -#define wxTreeCtrl_SortChildren(_swigobj,_swigarg0) (_swigobj->SortChildren(_swigarg0)) -static PyObject *_wrap_wxTreeCtrl_SortChildren(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxTreeCtrl * _arg0; - wxTreeItemId * _arg1; - char * _argc0 = 0; - char * _argc1 = 0; - - self = self; - if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_SortChildren",&_argc0,&_argc1)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTreeCtrl_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTreeCtrl_SortChildren. Expected _wxTreeCtrl_p."); - return NULL; - } - } - if (_argc1) { - if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxTreeItemId_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_SortChildren. Expected _wxTreeItemId_p."); - return NULL; - } - } - wxTreeCtrl_SortChildren(_arg0,*_arg1); - Py_INCREF(Py_None); - _resultobj = Py_None; - return _resultobj; -} - static PyMethodDef controls2cMethods[] = { - { "wxTreeCtrl_SortChildren", _wrap_wxTreeCtrl_SortChildren, 1 }, { "wxTreeCtrl_EndEditLabel", _wrap_wxTreeCtrl_EndEditLabel, 1 }, { "wxTreeCtrl_GetEditControl", _wrap_wxTreeCtrl_GetEditControl, 1 }, { "wxTreeCtrl_EditLabel", _wrap_wxTreeCtrl_EditLabel, 1 }, @@ -3842,7 +3787,6 @@ static PyMethodDef controls2cMethods[] = { { "wxTreeItemData_GetId", _wrap_wxTreeItemData_GetId, 1 }, { "delete_wxTreeItemData", _wrap_delete_wxTreeItemData, 1 }, { "new_wxTreeItemData", _wrap_new_wxTreeItemData, 1 }, - { "wxTreeItemId_GetId", _wrap_wxTreeItemId_GetId, 1 }, { "wxTreeItemId_IsOk", _wrap_wxTreeItemId_IsOk, 1 }, { "delete_wxTreeItemId", _wrap_delete_wxTreeItemId, 1 }, { "new_wxTreeItemId", _wrap_new_wxTreeItemId, 1 }, @@ -3968,6 +3912,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("_wxPrinterDC","_class_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); @@ -4007,6 +3952,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_wxTreeItemData","_class_wxTreeItemData",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); @@ -4070,6 +4016,7 @@ SWIGEXPORT(void,initcontrols2c)() { 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); @@ -4114,6 +4061,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_wxPrinterDC","_wxPrinterDC",0); @@ -4135,6 +4083,7 @@ SWIGEXPORT(void,initcontrols2c)() { 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); @@ -4168,6 +4117,7 @@ SWIGEXPORT(void,initcontrols2c)() { 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_wxTreeCtrl",SwigwxTreeCtrlTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxTreeCtrl",SwigwxTreeCtrlTowxWindow); diff --git a/utils/wxPython/src/msw/controls2.py b/utils/wxPython/src/msw/controls2.py index cd0ef14dd3..5ccdc674b9 100644 --- a/utils/wxPython/src/msw/controls2.py +++ b/utils/wxPython/src/msw/controls2.py @@ -328,9 +328,6 @@ class wxTreeItemIdPtr : def IsOk(self): val = controls2c.wxTreeItemId_IsOk(self.this) return val - def GetId(self): - val = controls2c.wxTreeItemId_GetId(self.this) - return val def __repr__(self): return "" class wxTreeItemId(wxTreeItemIdPtr): @@ -584,9 +581,6 @@ class wxTreeCtrlPtr(wxControlPtr): def EndEditLabel(self,arg0,*args): val = apply(controls2c.wxTreeCtrl_EndEditLabel,(self.this,arg0.this,)+args) return val - def SortChildren(self,arg0): - val = controls2c.wxTreeCtrl_SortChildren(self.this,arg0.this) - return val def __repr__(self): return "" class wxTreeCtrl(wxTreeCtrlPtr): diff --git a/utils/wxPython/src/msw/events.cpp b/utils/wxPython/src/msw/events.cpp index 4754b20c52..43508c554f 100644 --- a/utils/wxPython/src/msw/events.cpp +++ b/utils/wxPython/src/msw/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; @@ -102,15 +103,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"; @@ -682,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; @@ -2669,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); @@ -2689,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); @@ -2734,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); @@ -2744,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); @@ -2752,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); @@ -2791,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); @@ -2804,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); @@ -2814,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/msw/events.py b/utils/wxPython/src/msw/events.py index 130c95edbb..7d20bbc827 100644 --- a/utils/wxPython/src/msw/events.py +++ b/utils/wxPython/src/msw/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/msw/frames.cpp b/utils/wxPython/src/msw/frames.cpp index 17253d7d6b..ed3324469e 100644 --- a/utils/wxPython/src/msw/frames.cpp +++ b/utils/wxPython/src/msw/frames.cpp @@ -106,15 +106,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"; @@ -847,6 +846,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("_wxPrinterDC","_class_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); @@ -880,6 +880,7 @@ SWIGEXPORT(void,initframesc)() { 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("_wxToolBarTool","_class_wxToolBarTool",0); @@ -942,6 +943,7 @@ SWIGEXPORT(void,initframesc)() { 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("_wxStatusBar","_class_wxStatusBar",0); @@ -984,6 +986,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_wxPrinterDC","_wxPrinterDC",0); @@ -999,6 +1002,7 @@ SWIGEXPORT(void,initframesc)() { 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); @@ -1026,6 +1030,7 @@ SWIGEXPORT(void,initframesc)() { 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_wxMiniFrame",SwigwxMiniFrameTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxMiniFrame",SwigwxMiniFrameTowxWindow); diff --git a/utils/wxPython/src/msw/gdi.cpp b/utils/wxPython/src/msw/gdi.cpp index 05f7e25cf3..c152aff9b9 100644 --- a/utils/wxPython/src/msw/gdi.cpp +++ b/utils/wxPython/src/msw/gdi.cpp @@ -103,15 +103,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"; @@ -4781,6 +4780,37 @@ static PyObject *_wrap_new_wxPaintDC(PyObject *self, PyObject *args) { return _resultobj; } +static void *SwigwxWindowDCTowxDC(void *ptr) { + wxWindowDC *src; + wxDC *dest; + src = (wxWindowDC *) ptr; + dest = (wxDC *) src; + return (void *) dest; +} + +#define new_wxWindowDC(_swigarg0) (new wxWindowDC(_swigarg0)) +static PyObject *_wrap_new_wxWindowDC(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindowDC * _result; + wxWindow * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:new_wxWindowDC",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxWindowDC. Expected _wxWindow_p."); + return NULL; + } + } + _result = (wxWindowDC *)new_wxWindowDC(_arg0); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxWindowDC_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + static void *SwigwxPrinterDCTowxDC(void *ptr) { wxPrinterDC *src; wxDC *dest; @@ -4907,10 +4937,181 @@ static PyObject *_wrap_wxMetaFileDC_Close(PyObject *self, PyObject *args) { return _resultobj; } +#define new_wxPalette(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxPalette(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_new_wxPalette(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxPalette * _result; + int _arg0; + byte * _arg1; + byte * _arg2; + byte * _arg3; + PyObject * _obj1 = 0; + PyObject * _obj2 = 0; + PyObject * _obj3 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"OOO:new_wxPalette",&_obj1,&_obj2,&_obj3)) + return NULL; +{ + _arg1 = byte_LIST_helper(_obj1); + if (_arg1 == NULL) { + return NULL; + } +} +{ + _arg2 = byte_LIST_helper(_obj2); + if (_arg2 == NULL) { + return NULL; + } +} + if (_obj3) +{ + _arg3 = byte_LIST_helper(_obj3); + if (_arg3 == NULL) { + return NULL; + } +} +{ + _arg0 = PyList_Size(_obj1); +} + _result = (wxPalette *)new_wxPalette(_arg0,_arg1,_arg2,_arg3); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPalette_p"); + _resultobj = Py_BuildValue("s",_ptemp); +{ + delete [] _arg1; +} +{ + delete [] _arg2; +} +{ + delete [] _arg3; +} + return _resultobj; +} + +#define delete_wxPalette(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxPalette(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxPalette * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:delete_wxPalette",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxPalette. Expected _wxPalette_p."); + return NULL; + } + } + delete_wxPalette(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxPalette_GetPixel(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->GetPixel(_swigarg0,_swigarg1,_swigarg2)) +static PyObject *_wrap_wxPalette_GetPixel(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxPalette * _arg0; + byte _arg1; + byte _arg2; + byte _arg3; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sbbb:wxPalette_GetPixel",&_argc0,&_arg1,&_arg2,&_arg3)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetPixel. Expected _wxPalette_p."); + return NULL; + } + } + _result = (int )wxPalette_GetPixel(_arg0,_arg1,_arg2,_arg3); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxPalette_GetRGB(_swigobj,_swigarg0,_swigarg1,_swigarg2,_swigarg3) (_swigobj->GetRGB(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) +static PyObject *_wrap_wxPalette_GetRGB(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxPalette * _arg0; + int _arg1; + byte * _arg2; + byte * _arg3; + byte * _arg4; + char * _argc0 = 0; + char * _argc2 = 0; + char * _argc3 = 0; + char * _argc4 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sisss:wxPalette_GetRGB",&_argc0,&_arg1,&_argc2,&_argc3,&_argc4)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_GetRGB. Expected _wxPalette_p."); + return NULL; + } + } + if (_argc2) { + if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_byte_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxPalette_GetRGB. Expected _byte_p."); + return NULL; + } + } + if (_argc3) { + if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_byte_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxPalette_GetRGB. Expected _byte_p."); + return NULL; + } + } + if (_argc4) { + if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_byte_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxPalette_GetRGB. Expected _byte_p."); + return NULL; + } + } + _result = (bool )wxPalette_GetRGB(_arg0,_arg1,_arg2,_arg3,_arg4); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxPalette_Ok(_swigobj) (_swigobj->Ok()) +static PyObject *_wrap_wxPalette_Ok(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxPalette * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxPalette_Ok",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxPalette_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPalette_Ok. Expected _wxPalette_p."); + return NULL; + } + } + _result = (bool )wxPalette_Ok(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static PyMethodDef gdicMethods[] = { + { "wxPalette_Ok", _wrap_wxPalette_Ok, 1 }, + { "wxPalette_GetRGB", _wrap_wxPalette_GetRGB, 1 }, + { "wxPalette_GetPixel", _wrap_wxPalette_GetPixel, 1 }, + { "delete_wxPalette", _wrap_delete_wxPalette, 1 }, + { "new_wxPalette", _wrap_new_wxPalette, 1 }, { "wxMetaFileDC_Close", _wrap_wxMetaFileDC_Close, 1 }, { "new_wxMetaFileDC", _wrap_new_wxMetaFileDC, 1 }, { "new_wxPrinterDC", _wrap_new_wxPrinterDC, 1 }, + { "new_wxWindowDC", _wrap_new_wxWindowDC, 1 }, { "new_wxPaintDC", _wrap_new_wxPaintDC, 1 }, { "new_wxClientDC", _wrap_new_wxClientDC, 1 }, { "wxScreenDC_EndDrawingOnTop", _wrap_wxScreenDC_EndDrawingOnTop, 1 }, @@ -5141,6 +5342,8 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC); SWIG_RegisterMapping("_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC); SWIG_RegisterMapping("_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC); + SWIG_RegisterMapping("_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC); + SWIG_RegisterMapping("_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC); SWIG_RegisterMapping("_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC); SWIG_RegisterMapping("_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC); SWIG_RegisterMapping("_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC); @@ -5166,6 +5369,7 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_wxBitmap","_wxIcon",SwigwxIconTowxBitmap); SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); + SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_EBool","_signed_int",0); SWIG_RegisterMapping("_EBool","_int",0); @@ -5178,6 +5382,8 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_class_wxDC","_wxMetaFileDC",SwigwxMetaFileDCTowxDC); SWIG_RegisterMapping("_class_wxDC","_class_wxPrinterDC",SwigwxPrinterDCTowxDC); SWIG_RegisterMapping("_class_wxDC","_wxPrinterDC",SwigwxPrinterDCTowxDC); + SWIG_RegisterMapping("_class_wxDC","_class_wxWindowDC",SwigwxWindowDCTowxDC); + SWIG_RegisterMapping("_class_wxDC","_wxWindowDC",SwigwxWindowDCTowxDC); SWIG_RegisterMapping("_class_wxDC","_class_wxPaintDC",SwigwxPaintDCTowxDC); SWIG_RegisterMapping("_class_wxDC","_wxPaintDC",SwigwxPaintDCTowxDC); SWIG_RegisterMapping("_class_wxDC","_class_wxClientDC",SwigwxClientDCTowxDC); @@ -5209,6 +5415,7 @@ SWIGEXPORT(void,initgdic)() { 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_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); SWIG_RegisterMapping("_unsigned_char","_byte",0); @@ -5238,6 +5445,7 @@ SWIGEXPORT(void,initgdic)() { 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_wxClientDC","_wxClientDC",0); SWIG_RegisterMapping("_class_wxSize","_wxSize",0); SWIG_RegisterMapping("_class_wxBitmap","_class_wxCursor",SwigwxCursorTowxBitmap); @@ -5248,4 +5456,5 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0); SWIG_RegisterMapping("_wxDash","_unsigned_long",0); SWIG_RegisterMapping("_wxDash","_long",0); + SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0); } diff --git a/utils/wxPython/src/msw/gdi.py b/utils/wxPython/src/msw/gdi.py index cd16564062..5852c85e3b 100644 --- a/utils/wxPython/src/msw/gdi.py +++ b/utils/wxPython/src/msw/gdi.py @@ -20,6 +20,7 @@ class wxBitmapPtr : return val def GetPalette(self): val = gdic.wxBitmap_GetPalette(self.this) + val = wxPalettePtr(val) return val def GetMask(self): val = gdic.wxBitmap_GetMask(self.this) @@ -35,6 +36,10 @@ class wxBitmapPtr : val = gdic.wxBitmap_Ok(self.this) return val def SaveFile(self,arg0,arg1,*args): + argl = map(None,args) + try: argl[0] = argl[0].this + except: pass + args = tuple(argl) val = apply(gdic.wxBitmap_SaveFile,(self.this,arg0,arg1,)+args) return val def SetDepth(self,arg0): @@ -47,7 +52,7 @@ class wxBitmapPtr : val = gdic.wxBitmap_SetMask(self.this,arg0.this) return val def SetPalette(self,arg0): - val = gdic.wxBitmap_SetPalette(self.this,arg0) + val = gdic.wxBitmap_SetPalette(self.this,arg0.this) return val def SetWidth(self,arg0): val = gdic.wxBitmap_SetWidth(self.this,arg0) @@ -510,7 +515,7 @@ class wxDCPtr : val = gdic.wxDC_SetClippingRegion(self.this,arg0,arg1,arg2,arg3) return val def SetPalette(self,arg0): - val = gdic.wxDC_SetPalette(self.this,arg0) + val = gdic.wxDC_SetPalette(self.this,arg0.this) return val def SetBrush(self,arg0): val = gdic.wxDC_SetBrush(self.this,arg0.this) @@ -629,6 +634,20 @@ class wxPaintDC(wxPaintDCPtr): +class wxWindowDCPtr(wxDCPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __repr__(self): + return "" +class wxWindowDC(wxWindowDCPtr): + def __init__(self,arg0) : + self.this = gdic.new_wxWindowDC(arg0.this) + self.thisown = 1 + + + + class wxPrinterDCPtr(wxDCPtr): def __init__(self,this): self.this = this @@ -660,6 +679,32 @@ class wxMetaFileDC(wxMetaFileDCPtr): +class wxPalettePtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self): + if self.thisown == 1 : + gdic.delete_wxPalette(self.this) + def GetPixel(self,arg0,arg1,arg2): + val = gdic.wxPalette_GetPixel(self.this,arg0,arg1,arg2) + return val + def GetRGB(self,arg0,arg1,arg2,arg3): + val = gdic.wxPalette_GetRGB(self.this,arg0,arg1,arg2,arg3) + return val + def Ok(self): + val = gdic.wxPalette_Ok(self.this) + return val + def __repr__(self): + return "" +class wxPalette(wxPalettePtr): + def __init__(self,arg0,arg1,arg2) : + self.this = gdic.new_wxPalette(arg0,arg1,arg2) + self.thisown = 1 + + + + #-------------- FUNCTION WRAPPERS ------------------ diff --git a/utils/wxPython/src/msw/mdi.cpp b/utils/wxPython/src/msw/mdi.cpp index d4d5186acb..f2622dc6cb 100644 --- a/utils/wxPython/src/msw/mdi.cpp +++ b/utils/wxPython/src/msw/mdi.cpp @@ -102,15 +102,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"; @@ -779,6 +778,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("_wxPrinterDC","_class_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); @@ -812,6 +812,7 @@ SWIGEXPORT(void,initmdic)() { 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("_wxToolBarTool","_class_wxToolBarTool",0); @@ -880,6 +881,7 @@ SWIGEXPORT(void,initmdic)() { 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("_wxStatusBar","_class_wxStatusBar",0); @@ -924,6 +926,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_wxPrinterDC","_wxPrinterDC",0); @@ -940,6 +943,7 @@ SWIGEXPORT(void,initmdic)() { 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); @@ -969,6 +973,7 @@ SWIGEXPORT(void,initmdic)() { 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("_wxMDIClientWindow","_class_wxMDIClientWindow",0); SWIG_RegisterMapping("_wxWindow","_class_wxMDIClientWindow",SwigwxMDIClientWindowTowxWindow); diff --git a/utils/wxPython/src/msw/misc.cpp b/utils/wxPython/src/msw/misc.cpp index 59d110ae10..592dcd9225 100644 --- a/utils/wxPython/src/msw/misc.cpp +++ b/utils/wxPython/src/msw/misc.cpp @@ -103,15 +103,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"; @@ -2619,6 +2618,562 @@ static PyObject *_wrap_wxLayoutConstraints_width_get(PyObject *self, PyObject *a return _resultobj; } +#define new_wxRegion() (new wxRegion()) +static PyObject *_wrap_new_wxRegion(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRegion * _result; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,":new_wxRegion")) + return NULL; + _result = (wxRegion *)new_wxRegion(); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegion_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define delete_wxRegion(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxRegion(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRegion * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:delete_wxRegion",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRegion. Expected _wxRegion_p."); + return NULL; + } + } + delete_wxRegion(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxRegion_Clear(_swigobj) (_swigobj->Clear()) +static PyObject *_wrap_wxRegion_Clear(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRegion * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegion_Clear",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Clear. Expected _wxRegion_p."); + return NULL; + } + } + wxRegion_Clear(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxRegion_Contains(_swigobj,_swigarg0,_swigarg1) (_swigobj->Contains(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxRegion_Contains(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRegionContain _result; + wxRegion * _arg0; + long _arg1; + long _arg2; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sll:wxRegion_Contains",&_argc0,&_arg1,&_arg2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Contains. Expected _wxRegion_p."); + return NULL; + } + } + _result = (wxRegionContain )wxRegion_Contains(_arg0,_arg1,_arg2); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxRegion_ContainsPoint(_swigobj,_swigarg0) (_swigobj->Contains(_swigarg0)) +static PyObject *_wrap_wxRegion_ContainsPoint(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRegionContain _result; + wxRegion * _arg0; + wxPoint * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxRegion_ContainsPoint",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_ContainsPoint. Expected _wxRegion_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_ContainsPoint. Expected _wxPoint_p."); + return NULL; + } + } + _result = (wxRegionContain )wxRegion_ContainsPoint(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxRegion_ContainsRect(_swigobj,_swigarg0) (_swigobj->Contains(_swigarg0)) +static PyObject *_wrap_wxRegion_ContainsRect(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRegionContain _result; + wxRegion * _arg0; + wxRect * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxRegion_ContainsRect",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_ContainsRect. Expected _wxRegion_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_ContainsRect. Expected _wxRect_p."); + return NULL; + } + } + _result = (wxRegionContain )wxRegion_ContainsRect(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxRegion_GetBox(_swigobj) (_swigobj->GetBox()) +static PyObject *_wrap_wxRegion_GetBox(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRect * _result; + wxRegion * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegion_GetBox",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_GetBox. Expected _wxRegion_p."); + return NULL; + } + } + _result = new wxRect (wxRegion_GetBox(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxRegion_Intersect(_swigobj,_swigarg0) (_swigobj->Intersect(_swigarg0)) +static PyObject *_wrap_wxRegion_Intersect(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxRegion * _arg0; + wxRect * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxRegion_Intersect",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Intersect. Expected _wxRegion_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Intersect. Expected _wxRect_p."); + return NULL; + } + } + _result = (bool )wxRegion_Intersect(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxRegion_IsEmpty(_swigobj) (_swigobj->IsEmpty()) +static PyObject *_wrap_wxRegion_IsEmpty(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxRegion * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegion_IsEmpty",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_IsEmpty. Expected _wxRegion_p."); + return NULL; + } + } + _result = (bool )wxRegion_IsEmpty(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxRegion_Subtract(_swigobj,_swigarg0) (_swigobj->Subtract(_swigarg0)) +static PyObject *_wrap_wxRegion_Subtract(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxRegion * _arg0; + wxRect * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxRegion_Subtract",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Subtract. Expected _wxRegion_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Subtract. Expected _wxRect_p."); + return NULL; + } + } + _result = (bool )wxRegion_Subtract(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxRegion_Union(_swigobj,_swigarg0) (_swigobj->Union(_swigarg0)) +static PyObject *_wrap_wxRegion_Union(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxRegion * _arg0; + wxRect * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxRegion_Union",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Union. Expected _wxRegion_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Union. Expected _wxRect_p."); + return NULL; + } + } + _result = (bool )wxRegion_Union(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxRegion_Xor(_swigobj,_swigarg0) (_swigobj->Xor(_swigarg0)) +static PyObject *_wrap_wxRegion_Xor(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxRegion * _arg0; + wxRect * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxRegion_Xor",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegion_Xor. Expected _wxRegion_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxRect_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxRegion_Xor. Expected _wxRect_p."); + return NULL; + } + } + _result = (bool )wxRegion_Xor(_arg0,*_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define new_wxRegionIterator(_swigarg0) (new wxRegionIterator(_swigarg0)) +static PyObject *_wrap_new_wxRegionIterator(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRegionIterator * _result; + wxRegion * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:new_wxRegionIterator",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegion_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxRegionIterator. Expected _wxRegion_p."); + return NULL; + } + } + _result = (wxRegionIterator *)new_wxRegionIterator(*_arg0); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxRegionIterator_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define delete_wxRegionIterator(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxRegionIterator(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRegionIterator * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:delete_wxRegionIterator",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxRegionIterator. Expected _wxRegionIterator_p."); + return NULL; + } + } + delete_wxRegionIterator(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxRegionIterator_GetX(_swigobj) (_swigobj->GetX()) +static PyObject *_wrap_wxRegionIterator_GetX(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxRegionIterator * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetX",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetX. Expected _wxRegionIterator_p."); + return NULL; + } + } + _result = (long )wxRegionIterator_GetX(_arg0); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +#define wxRegionIterator_GetY(_swigobj) (_swigobj->GetY()) +static PyObject *_wrap_wxRegionIterator_GetY(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxRegionIterator * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetY",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetY. Expected _wxRegionIterator_p."); + return NULL; + } + } + _result = (long )wxRegionIterator_GetY(_arg0); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +#define wxRegionIterator_GetW(_swigobj) (_swigobj->GetW()) +static PyObject *_wrap_wxRegionIterator_GetW(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxRegionIterator * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetW",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetW. Expected _wxRegionIterator_p."); + return NULL; + } + } + _result = (long )wxRegionIterator_GetW(_arg0); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +#define wxRegionIterator_GetWidth(_swigobj) (_swigobj->GetWidth()) +static PyObject *_wrap_wxRegionIterator_GetWidth(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxRegionIterator * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetWidth",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetWidth. Expected _wxRegionIterator_p."); + return NULL; + } + } + _result = (long )wxRegionIterator_GetWidth(_arg0); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +#define wxRegionIterator_GetH(_swigobj) (_swigobj->GetH()) +static PyObject *_wrap_wxRegionIterator_GetH(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxRegionIterator * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetH",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetH. Expected _wxRegionIterator_p."); + return NULL; + } + } + _result = (long )wxRegionIterator_GetH(_arg0); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +#define wxRegionIterator_GetHeight(_swigobj) (_swigobj->GetHeight()) +static PyObject *_wrap_wxRegionIterator_GetHeight(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxRegionIterator * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetHeight",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetHeight. Expected _wxRegionIterator_p."); + return NULL; + } + } + _result = (long )wxRegionIterator_GetHeight(_arg0); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +#define wxRegionIterator_GetRect(_swigobj) (_swigobj->GetRect()) +static PyObject *_wrap_wxRegionIterator_GetRect(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRect * _result; + wxRegionIterator * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegionIterator_GetRect",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_GetRect. Expected _wxRegionIterator_p."); + return NULL; + } + } + _result = new wxRect (wxRegionIterator_GetRect(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxRegionIterator_HaveRects(_swigobj) (_swigobj->HaveRects()) +static PyObject *_wrap_wxRegionIterator_HaveRects(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxRegionIterator * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegionIterator_HaveRects",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_HaveRects. Expected _wxRegionIterator_p."); + return NULL; + } + } + _result = (bool )wxRegionIterator_HaveRects(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxRegionIterator_Reset(_swigobj) (_swigobj->Reset()) +static PyObject *_wrap_wxRegionIterator_Reset(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRegionIterator * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegionIterator_Reset",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_Reset. Expected _wxRegionIterator_p."); + return NULL; + } + } + wxRegionIterator_Reset(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +static void wxRegionIterator_Next(wxRegionIterator *self) { + (*self) ++; + } +static PyObject *_wrap_wxRegionIterator_Next(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRegionIterator * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxRegionIterator_Next",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxRegionIterator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxRegionIterator_Next. Expected _wxRegionIterator_p."); + return NULL; + } + } + wxRegionIterator_Next(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define new_wxAcceleratorEntry(_swigarg0,_swigarg1,_swigarg2) (new wxAcceleratorEntry(_swigarg0,_swigarg1,_swigarg2)) static PyObject *_wrap_new_wxAcceleratorEntry(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2762,6 +3317,30 @@ static PyMethodDef misccMethods[] = { { "wxAcceleratorEntry_GetFlags", _wrap_wxAcceleratorEntry_GetFlags, 1 }, { "wxAcceleratorEntry_Set", _wrap_wxAcceleratorEntry_Set, 1 }, { "new_wxAcceleratorEntry", _wrap_new_wxAcceleratorEntry, 1 }, + { "wxRegionIterator_Next", _wrap_wxRegionIterator_Next, 1 }, + { "wxRegionIterator_Reset", _wrap_wxRegionIterator_Reset, 1 }, + { "wxRegionIterator_HaveRects", _wrap_wxRegionIterator_HaveRects, 1 }, + { "wxRegionIterator_GetRect", _wrap_wxRegionIterator_GetRect, 1 }, + { "wxRegionIterator_GetHeight", _wrap_wxRegionIterator_GetHeight, 1 }, + { "wxRegionIterator_GetH", _wrap_wxRegionIterator_GetH, 1 }, + { "wxRegionIterator_GetWidth", _wrap_wxRegionIterator_GetWidth, 1 }, + { "wxRegionIterator_GetW", _wrap_wxRegionIterator_GetW, 1 }, + { "wxRegionIterator_GetY", _wrap_wxRegionIterator_GetY, 1 }, + { "wxRegionIterator_GetX", _wrap_wxRegionIterator_GetX, 1 }, + { "delete_wxRegionIterator", _wrap_delete_wxRegionIterator, 1 }, + { "new_wxRegionIterator", _wrap_new_wxRegionIterator, 1 }, + { "wxRegion_Xor", _wrap_wxRegion_Xor, 1 }, + { "wxRegion_Union", _wrap_wxRegion_Union, 1 }, + { "wxRegion_Subtract", _wrap_wxRegion_Subtract, 1 }, + { "wxRegion_IsEmpty", _wrap_wxRegion_IsEmpty, 1 }, + { "wxRegion_Intersect", _wrap_wxRegion_Intersect, 1 }, + { "wxRegion_GetBox", _wrap_wxRegion_GetBox, 1 }, + { "wxRegion_ContainsRect", _wrap_wxRegion_ContainsRect, 1 }, + { "wxRegion_ContainsPoint", _wrap_wxRegion_ContainsPoint, 1 }, + { "wxRegion_Contains", _wrap_wxRegion_Contains, 1 }, + { "wxRegion_Clear", _wrap_wxRegion_Clear, 1 }, + { "delete_wxRegion", _wrap_delete_wxRegion, 1 }, + { "new_wxRegion", _wrap_new_wxRegion, 1 }, { "wxLayoutConstraints_width_get", _wrap_wxLayoutConstraints_width_get, 1 }, { "wxLayoutConstraints_top_get", _wrap_wxLayoutConstraints_top_get, 1 }, { "wxLayoutConstraints_right_get", _wrap_wxLayoutConstraints_right_get, 1 }, @@ -2901,12 +3480,16 @@ SWIGEXPORT(void,initmiscc)() { PyDict_SetItemString(d,"wxRightOf", PyInt_FromLong((long) wxRightOf)); PyDict_SetItemString(d,"wxSameAs", PyInt_FromLong((long) wxSameAs)); PyDict_SetItemString(d,"wxAbsolute", PyInt_FromLong((long) wxAbsolute)); + PyDict_SetItemString(d,"wxOutRegion", PyInt_FromLong((long) wxOutRegion)); + PyDict_SetItemString(d,"wxPartRegion", PyInt_FromLong((long) wxPartRegion)); + PyDict_SetItemString(d,"wxInRegion", PyInt_FromLong((long) wxInRegion)); /* * These are the pointer type-equivalency mappings. * (Used by the SWIG pointer type-checker). */ SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0); SWIG_RegisterMapping("_signed_long","_long",0); + SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0); SWIG_RegisterMapping("_wxIndividualLayoutConstraint","_class_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_byte","_unsigned_char",0); SWIG_RegisterMapping("_long","_unsigned_long",0); @@ -2923,6 +3506,7 @@ SWIGEXPORT(void,initmiscc)() { SWIG_RegisterMapping("_EBool","_signed_int",0); SWIG_RegisterMapping("_EBool","_int",0); SWIG_RegisterMapping("_EBool","_wxWindowID",0); + SWIG_RegisterMapping("_class_wxRegion","_wxRegion",0); SWIG_RegisterMapping("_unsigned_long","_long",0); SWIG_RegisterMapping("_class_wxRect","_wxRect",0); SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0); @@ -2959,6 +3543,8 @@ SWIGEXPORT(void,initmiscc)() { SWIG_RegisterMapping("_int","_unsigned_int",0); SWIG_RegisterMapping("_int","_signed_int",0); SWIG_RegisterMapping("_wxSize","_class_wxSize",0); + SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0); SWIG_RegisterMapping("_class_wxLayoutConstraints","_wxLayoutConstraints",0); + SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0); SWIG_RegisterMapping("_class_wxSize","_wxSize",0); } diff --git a/utils/wxPython/src/msw/misc.py b/utils/wxPython/src/msw/misc.py index 2dd91a04b7..a83367ea2b 100644 --- a/utils/wxPython/src/msw/misc.py +++ b/utils/wxPython/src/msw/misc.py @@ -325,6 +325,104 @@ class wxLayoutConstraints(wxLayoutConstraintsPtr): +class wxRegionPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self): + if self.thisown == 1 : + miscc.delete_wxRegion(self.this) + def Clear(self): + val = miscc.wxRegion_Clear(self.this) + return val + def Contains(self,arg0,arg1): + val = miscc.wxRegion_Contains(self.this,arg0,arg1) + return val + def ContainsPoint(self,arg0): + val = miscc.wxRegion_ContainsPoint(self.this,arg0.this) + return val + def ContainsRect(self,arg0): + val = miscc.wxRegion_ContainsRect(self.this,arg0.this) + return val + def GetBox(self): + val = miscc.wxRegion_GetBox(self.this) + val = wxRectPtr(val) + val.thisown = 1 + return val + def Intersect(self,arg0): + val = miscc.wxRegion_Intersect(self.this,arg0.this) + return val + def IsEmpty(self): + val = miscc.wxRegion_IsEmpty(self.this) + return val + def Subtract(self,arg0): + val = miscc.wxRegion_Subtract(self.this,arg0.this) + return val + def Union(self,arg0): + val = miscc.wxRegion_Union(self.this,arg0.this) + return val + def Xor(self,arg0): + val = miscc.wxRegion_Xor(self.this,arg0.this) + return val + def __repr__(self): + return "" +class wxRegion(wxRegionPtr): + def __init__(self) : + self.this = miscc.new_wxRegion() + self.thisown = 1 + + + + +class wxRegionIteratorPtr : + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self): + if self.thisown == 1 : + miscc.delete_wxRegionIterator(self.this) + def GetX(self): + val = miscc.wxRegionIterator_GetX(self.this) + return val + def GetY(self): + val = miscc.wxRegionIterator_GetY(self.this) + return val + def GetW(self): + val = miscc.wxRegionIterator_GetW(self.this) + return val + def GetWidth(self): + val = miscc.wxRegionIterator_GetWidth(self.this) + return val + def GetH(self): + val = miscc.wxRegionIterator_GetH(self.this) + return val + def GetHeight(self): + val = miscc.wxRegionIterator_GetHeight(self.this) + return val + def GetRect(self): + val = miscc.wxRegionIterator_GetRect(self.this) + val = wxRectPtr(val) + val.thisown = 1 + return val + def HaveRects(self): + val = miscc.wxRegionIterator_HaveRects(self.this) + return val + def Reset(self): + val = miscc.wxRegionIterator_Reset(self.this) + return val + def Next(self): + val = miscc.wxRegionIterator_Next(self.this) + return val + def __repr__(self): + return "" +class wxRegionIterator(wxRegionIteratorPtr): + def __init__(self,arg0) : + self.this = miscc.new_wxRegionIterator(arg0.this) + self.thisown = 1 + + + + class wxAcceleratorEntryPtr : def __init__(self,this): self.this = this @@ -532,3 +630,6 @@ wxLeftOf = miscc.wxLeftOf wxRightOf = miscc.wxRightOf wxSameAs = miscc.wxSameAs wxAbsolute = miscc.wxAbsolute +wxOutRegion = miscc.wxOutRegion +wxPartRegion = miscc.wxPartRegion +wxInRegion = miscc.wxInRegion diff --git a/utils/wxPython/src/msw/stattool.cpp b/utils/wxPython/src/msw/stattool.cpp index a80d77a376..b061d20a0c 100644 --- a/utils/wxPython/src/msw/stattool.cpp +++ b/utils/wxPython/src/msw/stattool.cpp @@ -104,15 +104,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"; @@ -1610,6 +1609,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("_wxPrinterDC","_class_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); @@ -1642,6 +1642,7 @@ SWIGEXPORT(void,initstattoolc)() { 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("_wxToolBarTool","_class_wxToolBarTool",0); @@ -1704,6 +1705,7 @@ SWIGEXPORT(void,initstattoolc)() { 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("_wxStatusBar","_class_wxStatusBar",0); @@ -1745,6 +1747,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_wxPrinterDC","_wxPrinterDC",0); @@ -1762,6 +1765,7 @@ SWIGEXPORT(void,initstattoolc)() { 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); @@ -1788,6 +1792,7 @@ SWIGEXPORT(void,initstattoolc)() { 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_wxToolBar",SwigwxToolBarTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxToolBar",SwigwxToolBarTowxWindow); diff --git a/utils/wxPython/src/msw/windows.cpp b/utils/wxPython/src/msw/windows.cpp index 0d09c466ff..19c3b5d104 100644 --- a/utils/wxPython/src/msw/windows.cpp +++ b/utils/wxPython/src/msw/windows.cpp @@ -111,15 +111,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"; @@ -4455,6 +4454,7 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_wxPoint","_class_wxPoint",0); SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); + SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); SWIG_RegisterMapping("_EBool","_signed_int",0); SWIG_RegisterMapping("_EBool","_int",0); @@ -4499,6 +4499,7 @@ SWIGEXPORT(void,initwindowsc)() { 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_wxAcceleratorEntry","_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxCursor","_wxCursor",0); SWIG_RegisterMapping("_wxScrolledWindow","_class_wxScrolledWindow",0); @@ -4534,6 +4535,7 @@ SWIGEXPORT(void,initwindowsc)() { 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_wxClientDC","_wxClientDC",0); SWIG_RegisterMapping("_class_wxSize","_wxSize",0); SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0); @@ -4558,6 +4560,7 @@ SWIGEXPORT(void,initwindowsc)() { SWIG_RegisterMapping("_wxDash","_unsigned_long",0); SWIG_RegisterMapping("_wxDash","_long",0); SWIG_RegisterMapping("_class_wxScrolledWindow","_wxScrolledWindow",0); + SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0); SWIG_RegisterMapping("_wxWindow","_class_wxScrolledWindow",SwigwxScrolledWindowTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxScrolledWindow",SwigwxScrolledWindowTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxDialog",SwigwxDialogTowxWindow); diff --git a/utils/wxPython/src/msw/windows2.cpp b/utils/wxPython/src/msw/windows2.cpp index 2424cfb964..cf9c51e8ce 100644 --- a/utils/wxPython/src/msw/windows2.cpp +++ b/utils/wxPython/src/msw/windows2.cpp @@ -57,6 +57,9 @@ extern PyObject *SWIG_newvarlink(void); #include #include #include +#ifdef __WXMSW__ +#include +#endif static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -105,18 +108,53 @@ 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"; +#define new_wxGridCell() (new wxGridCell()) +static PyObject *_wrap_new_wxGridCell(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxGridCell * _result; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,":new_wxGridCell")) + return NULL; + _result = (wxGridCell *)new_wxGridCell(); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define delete_wxGridCell(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxGridCell(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxGridCell * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:delete_wxGridCell",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGridCell_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxGridCell. Expected _wxGridCell_p."); + return NULL; + } + } + delete_wxGridCell(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxGridCell_GetTextValue(_swigobj) (_swigobj->GetTextValue()) static PyObject *_wrap_wxGridCell_GetTextValue(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -1515,6 +1553,30 @@ static PyObject *_wrap_wxGrid_InsertRows(PyObject *self, PyObject *args) { return _resultobj; } +#define wxGrid_OnActivate(_swigobj,_swigarg0) (_swigobj->OnActivate(_swigarg0)) +static PyObject *_wrap_wxGrid_OnActivate(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxGrid * _arg0; + bool _arg1; + char * _argc0 = 0; + int tempbool1; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxGrid_OnActivate",&_argc0,&tempbool1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxGrid_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxGrid_OnActivate. Expected _wxGrid_p."); + return NULL; + } + } + _arg1 = (bool ) tempbool1; + wxGrid_OnActivate(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxGrid_SetCellAlignment(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->SetCellAlignment(_swigarg0,_swigarg1,_swigarg2)) static PyObject *_wrap_wxGrid_SetCellAlignment(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2089,6 +2151,163 @@ static PyObject *_wrap_wxGrid_UpdateDimensions(PyObject *self, PyObject *args) { return _resultobj; } +static void *SwigwxGridEventTowxEvent(void *ptr) { + wxGridEvent *src; + wxEvent *dest; + src = (wxGridEvent *) ptr; + dest = (wxEvent *) src; + return (void *) dest; +} + +#define wxGridEvent_m_row_get(_swigobj) ((int ) _swigobj->m_row) +static PyObject *_wrap_wxGridEvent_m_row_get(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxGridEvent * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_row_get",&_argc0)) + 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_get. Expected _wxGridEvent_p."); + return NULL; + } + } + _result = (int )wxGridEvent_m_row_get(_arg0); + _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; + int _result; + wxGridEvent * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_col_get",&_argc0)) + 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_get. Expected _wxGridEvent_p."); + return NULL; + } + } + _result = (int )wxGridEvent_m_col_get(_arg0); + _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; + int _result; + wxGridEvent * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_x_get",&_argc0)) + 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_get. Expected _wxGridEvent_p."); + return NULL; + } + } + _result = (int )wxGridEvent_m_x_get(_arg0); + _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; + int _result; + wxGridEvent * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_y_get",&_argc0)) + 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_get. Expected _wxGridEvent_p."); + return NULL; + } + } + _result = (int )wxGridEvent_m_y_get(_arg0); + _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; + bool _result; + wxGridEvent * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_control_get",&_argc0)) + 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_get. Expected _wxGridEvent_p."); + return NULL; + } + } + _result = (bool )wxGridEvent_m_control_get(_arg0); + _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; + bool _result; + wxGridEvent * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_shift_get",&_argc0)) + 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_get. Expected _wxGridEvent_p."); + return NULL; + } + } + _result = (bool )wxGridEvent_m_shift_get(_arg0); + _resultobj = Py_BuildValue("i",_result); + 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; + wxGridCell * _result; + wxGridEvent * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxGridEvent_m_cell_get",&_argc0)) + 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_get. Expected _wxGridEvent_p."); + return NULL; + } + } + _result = (wxGridCell *)wxGridEvent_m_cell_get(_arg0); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxGridCell_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + static void *SwigwxNotebookEventTowxCommandEvent(void *ptr) { wxNotebookEvent *src; wxCommandEvent *dest; @@ -2665,7 +2884,7 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args) { wxWindowID _arg1; wxPoint * _arg2 = &wxPyDefaultPosition; wxSize * _arg3 = &wxPyDefaultSize; - long _arg4 = (wxSP_3D); + long _arg4 = (wxSP_3D)|wxCLIP_CHILDREN; char * _arg5 = "splitterWindow"; char * _argc0 = 0; char * _argc2 = 0; @@ -2699,6 +2918,27 @@ static PyObject *_wrap_new_wxSplitterWindow(PyObject *self, PyObject *args) { return _resultobj; } +#define wxSplitterWindow_GetBorderSize(_swigobj) (_swigobj->GetBorderSize()) +static PyObject *_wrap_wxSplitterWindow_GetBorderSize(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxSplitterWindow * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetBorderSize",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetBorderSize. Expected _wxSplitterWindow_p."); + return NULL; + } + } + _result = (int )wxSplitterWindow_GetBorderSize(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxSplitterWindow_GetMinimumPaneSize(_swigobj) (_swigobj->GetMinimumPaneSize()) static PyObject *_wrap_wxSplitterWindow_GetMinimumPaneSize(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2741,6 +2981,27 @@ static PyObject *_wrap_wxSplitterWindow_GetSashPosition(PyObject *self, PyObject return _resultobj; } +#define wxSplitterWindow_GetSashSize(_swigobj) (_swigobj->GetSashSize()) +static PyObject *_wrap_wxSplitterWindow_GetSashSize(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxSplitterWindow * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxSplitterWindow_GetSashSize",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_GetSashSize. Expected _wxSplitterWindow_p."); + return NULL; + } + } + _result = (int )wxSplitterWindow_GetSashSize(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxSplitterWindow_GetSplitMode(_swigobj) (_swigobj->GetSplitMode()) static PyObject *_wrap_wxSplitterWindow_GetSplitMode(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2858,6 +3119,28 @@ static PyObject *_wrap_wxSplitterWindow_IsSplit(PyObject *self, PyObject *args) return _resultobj; } +#define wxSplitterWindow_SetBorderSize(_swigobj,_swigarg0) (_swigobj->SetBorderSize(_swigarg0)) +static PyObject *_wrap_wxSplitterWindow_SetBorderSize(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxSplitterWindow * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxSplitterWindow_SetBorderSize",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetBorderSize. Expected _wxSplitterWindow_p."); + return NULL; + } + } + wxSplitterWindow_SetBorderSize(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxSplitterWindow_SetSashPosition(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetSashPosition(_swigarg0,_swigarg1)) static PyObject *_wrap_wxSplitterWindow_SetSashPosition(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2881,6 +3164,28 @@ static PyObject *_wrap_wxSplitterWindow_SetSashPosition(PyObject *self, PyObject return _resultobj; } +#define wxSplitterWindow_SetSashSize(_swigobj,_swigarg0) (_swigobj->SetSashSize(_swigarg0)) +static PyObject *_wrap_wxSplitterWindow_SetSashSize(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxSplitterWindow * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxSplitterWindow_SetSashSize",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxSplitterWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxSplitterWindow_SetSashSize. Expected _wxSplitterWindow_p."); + return NULL; + } + } + wxSplitterWindow_SetSashSize(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxSplitterWindow_SetMinimumPaneSize(_swigobj,_swigarg0) (_swigobj->SetMinimumPaneSize(_swigarg0)) static PyObject *_wrap_wxSplitterWindow_SetMinimumPaneSize(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3030,20 +3335,123 @@ static PyObject *_wrap_wxSplitterWindow_Unsplit(PyObject *self, PyObject *args) return _resultobj; } +static void *SwigwxTaskBarIconTowxEvtHandler(void *ptr) { + wxTaskBarIcon *src; + wxEvtHandler *dest; + src = (wxTaskBarIcon *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +#define new_wxTaskBarIcon() (new wxTaskBarIcon()) +static PyObject *_wrap_new_wxTaskBarIcon(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTaskBarIcon * _result; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,":new_wxTaskBarIcon")) + return NULL; + _result = (wxTaskBarIcon *)new_wxTaskBarIcon(); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxTaskBarIcon_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define delete_wxTaskBarIcon(_swigobj) (delete _swigobj) +static PyObject *_wrap_delete_wxTaskBarIcon(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTaskBarIcon * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:delete_wxTaskBarIcon",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTaskBarIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of delete_wxTaskBarIcon. Expected _wxTaskBarIcon_p."); + return NULL; + } + } + delete_wxTaskBarIcon(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxTaskBarIcon_SetIcon(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetIcon(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxTaskBarIcon_SetIcon(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxTaskBarIcon * _arg0; + wxIcon * _arg1; + char * _arg2 = ""; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss|s:wxTaskBarIcon_SetIcon",&_argc0,&_argc1,&_arg2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTaskBarIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTaskBarIcon_SetIcon. Expected _wxTaskBarIcon_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTaskBarIcon_SetIcon. Expected _wxIcon_p."); + return NULL; + } + } + _result = (bool )wxTaskBarIcon_SetIcon(_arg0,*_arg1,_arg2); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxTaskBarIcon_RemoveIcon(_swigobj) (_swigobj->RemoveIcon()) +static PyObject *_wrap_wxTaskBarIcon_RemoveIcon(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxTaskBarIcon * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxTaskBarIcon_RemoveIcon",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxTaskBarIcon_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxTaskBarIcon_RemoveIcon. Expected _wxTaskBarIcon_p."); + return NULL; + } + } + _result = (bool )wxTaskBarIcon_RemoveIcon(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static PyMethodDef windows2cMethods[] = { + { "wxTaskBarIcon_RemoveIcon", _wrap_wxTaskBarIcon_RemoveIcon, 1 }, + { "wxTaskBarIcon_SetIcon", _wrap_wxTaskBarIcon_SetIcon, 1 }, + { "delete_wxTaskBarIcon", _wrap_delete_wxTaskBarIcon, 1 }, + { "new_wxTaskBarIcon", _wrap_new_wxTaskBarIcon, 1 }, { "wxSplitterWindow_Unsplit", _wrap_wxSplitterWindow_Unsplit, 1 }, { "wxSplitterWindow_SplitVertically", _wrap_wxSplitterWindow_SplitVertically, 1 }, { "wxSplitterWindow_SplitHorizontally", _wrap_wxSplitterWindow_SplitHorizontally, 1 }, { "wxSplitterWindow_SetSplitMode", _wrap_wxSplitterWindow_SetSplitMode, 1 }, { "wxSplitterWindow_SetMinimumPaneSize", _wrap_wxSplitterWindow_SetMinimumPaneSize, 1 }, + { "wxSplitterWindow_SetSashSize", _wrap_wxSplitterWindow_SetSashSize, 1 }, { "wxSplitterWindow_SetSashPosition", _wrap_wxSplitterWindow_SetSashPosition, 1 }, + { "wxSplitterWindow_SetBorderSize", _wrap_wxSplitterWindow_SetBorderSize, 1 }, { "wxSplitterWindow_IsSplit", _wrap_wxSplitterWindow_IsSplit, 1 }, { "wxSplitterWindow_Initialize", _wrap_wxSplitterWindow_Initialize, 1 }, { "wxSplitterWindow_GetWindow2", _wrap_wxSplitterWindow_GetWindow2, 1 }, { "wxSplitterWindow_GetWindow1", _wrap_wxSplitterWindow_GetWindow1, 1 }, { "wxSplitterWindow_GetSplitMode", _wrap_wxSplitterWindow_GetSplitMode, 1 }, + { "wxSplitterWindow_GetSashSize", _wrap_wxSplitterWindow_GetSashSize, 1 }, { "wxSplitterWindow_GetSashPosition", _wrap_wxSplitterWindow_GetSashPosition, 1 }, { "wxSplitterWindow_GetMinimumPaneSize", _wrap_wxSplitterWindow_GetMinimumPaneSize, 1 }, + { "wxSplitterWindow_GetBorderSize", _wrap_wxSplitterWindow_GetBorderSize, 1 }, { "new_wxSplitterWindow", _wrap_new_wxSplitterWindow, 1 }, { "wxNotebook_GetPage", _wrap_wxNotebook_GetPage, 1 }, { "wxNotebook_InsertPage", _wrap_wxNotebook_InsertPage, 1 }, @@ -3064,6 +3472,13 @@ static PyMethodDef windows2cMethods[] = { { "new_wxNotebook", _wrap_new_wxNotebook, 1 }, { "wxNotebookEvent_GetOldSelection", _wrap_wxNotebookEvent_GetOldSelection, 1 }, { "wxNotebookEvent_GetSelection", _wrap_wxNotebookEvent_GetSelection, 1 }, + { "wxGridEvent_m_cell_get", _wrap_wxGridEvent_m_cell_get, 1 }, + { "wxGridEvent_m_shift_get", _wrap_wxGridEvent_m_shift_get, 1 }, + { "wxGridEvent_m_control_get", _wrap_wxGridEvent_m_control_get, 1 }, + { "wxGridEvent_m_y_get", _wrap_wxGridEvent_m_y_get, 1 }, + { "wxGridEvent_m_x_get", _wrap_wxGridEvent_m_x_get, 1 }, + { "wxGridEvent_m_col_get", _wrap_wxGridEvent_m_col_get, 1 }, + { "wxGridEvent_m_row_get", _wrap_wxGridEvent_m_row_get, 1 }, { "wxGrid_UpdateDimensions", _wrap_wxGrid_UpdateDimensions, 1 }, { "wxGrid_SetRowHeight", _wrap_wxGrid_SetRowHeight, 1 }, { "wxGrid_SetLabelValue", _wrap_wxGrid_SetLabelValue, 1 }, @@ -3085,6 +3500,7 @@ static PyMethodDef windows2cMethods[] = { { "wxGrid_SetCellBackgroundColour", _wrap_wxGrid_SetCellBackgroundColour, 1 }, { "wxGrid_SetDefCellAlignment", _wrap_wxGrid_SetDefCellAlignment, 1 }, { "wxGrid_SetCellAlignment", _wrap_wxGrid_SetCellAlignment, 1 }, + { "wxGrid_OnActivate", _wrap_wxGrid_OnActivate, 1 }, { "wxGrid_InsertRows", _wrap_wxGrid_InsertRows, 1 }, { "wxGrid_InsertCols", _wrap_wxGrid_InsertCols, 1 }, { "wxGrid_GetVertScrollBar", _wrap_wxGrid_GetVertScrollBar, 1 }, @@ -3141,6 +3557,8 @@ static PyMethodDef windows2cMethods[] = { { "wxGridCell_GetFont", _wrap_wxGridCell_GetFont, 1 }, { "wxGridCell_SetTextValue", _wrap_wxGridCell_SetTextValue, 1 }, { "wxGridCell_GetTextValue", _wrap_wxGridCell_GetTextValue, 1 }, + { "delete_wxGridCell", _wrap_delete_wxGridCell, 1 }, + { "new_wxGridCell", _wrap_new_wxGridCell, 1 }, { NULL, NULL } }; static PyObject *SWIG_globals; @@ -3155,6 +3573,22 @@ SWIGEXPORT(void,initwindows2c)() { PyDict_SetItemString(d,"wxGRID_TEXT_CTRL", PyInt_FromLong((long) wxGRID_TEXT_CTRL)); PyDict_SetItemString(d,"wxGRID_HSCROLL", PyInt_FromLong((long) wxGRID_HSCROLL)); PyDict_SetItemString(d,"wxGRID_VSCROLL", PyInt_FromLong((long) wxGRID_VSCROLL)); + PyDict_SetItemString(d,"wxEVT_GRID_SELECT_CELL", PyInt_FromLong((long) wxEVT_GRID_SELECT_CELL)); + PyDict_SetItemString(d,"wxEVT_GRID_CREATE_CELL", PyInt_FromLong((long) wxEVT_GRID_CREATE_CELL)); + PyDict_SetItemString(d,"wxEVT_GRID_CHANGE_LABELS", PyInt_FromLong((long) wxEVT_GRID_CHANGE_LABELS)); + PyDict_SetItemString(d,"wxEVT_GRID_CHANGE_SEL_LABEL", PyInt_FromLong((long) wxEVT_GRID_CHANGE_SEL_LABEL)); + PyDict_SetItemString(d,"wxEVT_GRID_CELL_CHANGE", PyInt_FromLong((long) wxEVT_GRID_CELL_CHANGE)); + PyDict_SetItemString(d,"wxEVT_GRID_CELL_LCLICK", PyInt_FromLong((long) wxEVT_GRID_CELL_LCLICK)); + PyDict_SetItemString(d,"wxEVT_GRID_CELL_RCLICK", PyInt_FromLong((long) wxEVT_GRID_CELL_RCLICK)); + PyDict_SetItemString(d,"wxEVT_GRID_LABEL_LCLICK", PyInt_FromLong((long) wxEVT_GRID_LABEL_LCLICK)); + PyDict_SetItemString(d,"wxEVT_GRID_LABEL_RCLICK", PyInt_FromLong((long) wxEVT_GRID_LABEL_RCLICK)); + PyDict_SetItemString(d,"wxEVT_TASKBAR_MOVE", PyInt_FromLong((long) wxEVT_TASKBAR_MOVE)); + PyDict_SetItemString(d,"wxEVT_TASKBAR_LEFT_DOWN", PyInt_FromLong((long) wxEVT_TASKBAR_LEFT_DOWN)); + PyDict_SetItemString(d,"wxEVT_TASKBAR_LEFT_UP", PyInt_FromLong((long) wxEVT_TASKBAR_LEFT_UP)); + PyDict_SetItemString(d,"wxEVT_TASKBAR_RIGHT_DOWN", PyInt_FromLong((long) wxEVT_TASKBAR_RIGHT_DOWN)); + PyDict_SetItemString(d,"wxEVT_TASKBAR_RIGHT_UP", PyInt_FromLong((long) wxEVT_TASKBAR_RIGHT_UP)); + PyDict_SetItemString(d,"wxEVT_TASKBAR_LEFT_DCLICK", PyInt_FromLong((long) wxEVT_TASKBAR_LEFT_DCLICK)); + PyDict_SetItemString(d,"wxEVT_TASKBAR_RIGHT_DCLICK", PyInt_FromLong((long) wxEVT_TASKBAR_RIGHT_DCLICK)); /* * These are the pointer type-equivalency mappings. * (Used by the SWIG pointer type-checker). @@ -3162,11 +3596,16 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_wxAcceleratorTable","_class_wxAcceleratorTable",0); SWIG_RegisterMapping("_wxEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxEvent); SWIG_RegisterMapping("_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent); + SWIG_RegisterMapping("_wxEvent","_class_wxGridEvent",SwigwxGridEventTowxEvent); + SWIG_RegisterMapping("_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent); SWIG_RegisterMapping("_wxEvent","_class_wxEvent",0); 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_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler); + SWIG_RegisterMapping("_class_wxEvtHandler","_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxNotebook",SwigwxNotebookTowxEvtHandler); @@ -3195,6 +3634,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("_wxPrinterDC","_class_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); @@ -3221,8 +3661,11 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_uint","_wxWindowID",0); SWIG_RegisterMapping("_class_wxEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxEvent); SWIG_RegisterMapping("_class_wxEvent","_wxNotebookEvent",SwigwxNotebookEventTowxEvent); + SWIG_RegisterMapping("_class_wxEvent","_class_wxGridEvent",SwigwxGridEventTowxEvent); + SWIG_RegisterMapping("_class_wxEvent","_wxGridEvent",SwigwxGridEventTowxEvent); SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0); SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0); + SWIG_RegisterMapping("_wxGridEvent","_class_wxGridEvent",0); SWIG_RegisterMapping("_wxRect","_class_wxRect",0); SWIG_RegisterMapping("_wxCommandEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent); SWIG_RegisterMapping("_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent); @@ -3232,7 +3675,9 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_class_wxButton","_wxButton",0); SWIG_RegisterMapping("_wxRadioBox","_class_wxRadioBox",0); SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); + SWIG_RegisterMapping("_wxTaskBarIcon","_class_wxTaskBarIcon",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); @@ -3242,6 +3687,7 @@ SWIGEXPORT(void,initwindows2c)() { 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); @@ -3299,7 +3745,9 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_signed_short","_WXTYPE",0); SWIG_RegisterMapping("_signed_short","_short",0); SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0); + SWIG_RegisterMapping("_class_wxTaskBarIcon","_wxTaskBarIcon",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); @@ -3340,8 +3788,10 @@ 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("_wxRegionIterator","_class_wxRegionIterator",0); SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0); SWIG_RegisterMapping("_class_wxSysColourChangedEvent","_wxSysColourChangedEvent",0); @@ -3357,14 +3807,17 @@ SWIGEXPORT(void,initwindows2c)() { 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_wxSplitterWindow","_wxSplitterWindow",0); SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0); SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0); SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0); SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0); + SWIG_RegisterMapping("_class_wxGridEvent","_wxGridEvent",0); SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent); SWIG_RegisterMapping("_class_wxCommandEvent","_wxNotebookEvent",SwigwxNotebookEventTowxCommandEvent); SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0); @@ -3375,6 +3828,8 @@ SWIGEXPORT(void,initwindows2c)() { SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0); SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0); SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0); + SWIG_RegisterMapping("_wxEvtHandler","_class_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler); + SWIG_RegisterMapping("_wxEvtHandler","_wxTaskBarIcon",SwigwxTaskBarIconTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxSplitterWindow",SwigwxSplitterWindowTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxNotebook",SwigwxNotebookTowxEvtHandler); @@ -3389,6 +3844,7 @@ SWIGEXPORT(void,initwindows2c)() { 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_wxSplitterWindow",SwigwxSplitterWindowTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxSplitterWindow",SwigwxSplitterWindowTowxWindow); diff --git a/utils/wxPython/src/msw/windows2.py b/utils/wxPython/src/msw/windows2.py index 56e77137b7..bc40f10590 100644 --- a/utils/wxPython/src/msw/windows2.py +++ b/utils/wxPython/src/msw/windows2.py @@ -15,6 +15,9 @@ class wxGridCellPtr : def __init__(self,this): self.this = this self.thisown = 0 + def __del__(self): + if self.thisown == 1 : + windows2c.delete_wxGridCell(self.this) def GetTextValue(self): val = windows2c.wxGridCell_GetTextValue(self.this) return val @@ -62,8 +65,9 @@ class wxGridCellPtr : def __repr__(self): return "" class wxGridCell(wxGridCellPtr): - def __init__(self,this): - self.this = this + def __init__(self) : + self.this = windows2c.new_wxGridCell() + self.thisown = 1 @@ -212,6 +216,9 @@ class wxGridPtr(wxPanelPtr): def InsertRows(self,*args): val = apply(windows2c.wxGrid_InsertRows,(self.this,)+args) return val + def OnActivate(self,arg0): + val = windows2c.wxGrid_OnActivate(self.this,arg0) + return val def SetCellAlignment(self,arg0,arg1,arg2): val = windows2c.wxGrid_SetCellAlignment(self.this,arg0,arg1,arg2) return val @@ -288,6 +295,67 @@ class wxGrid(wxGridPtr): self.this = apply(windows2c.new_wxGrid,(arg0.this,arg1,)+args) self.thisown = 1 wxp._StdWindowCallbacks(self) + wxp._checkForCallback(self, 'OnSelectCell', wxEVT_GRID_SELECT_CELL) + wxp._checkForCallback(self, 'OnCreateCell', wxEVT_GRID_CREATE_CELL) + wxp._checkForCallback(self, 'OnChangeLabels', wxEVT_GRID_CHANGE_LABELS) + wxp._checkForCallback(self, 'OnChangeSelectionLabel', wxEVT_GRID_CHANGE_SEL_LABEL) + wxp._checkForCallback(self, 'OnCellChange', wxEVT_GRID_CELL_CHANGE) + wxp._checkForCallback(self, 'OnCellLeftClick', wxEVT_GRID_CELL_LCLICK) + wxp._checkForCallback(self, 'OnCellRightClick', wxEVT_GRID_CELL_RCLICK) + wxp._checkForCallback(self, 'OnLabelLeftClick', wxEVT_GRID_LABEL_LCLICK) + wxp._checkForCallback(self, 'OnLabelRightClick', wxEVT_GRID_LABEL_RCLICK) + + + + +class wxGridEventPtr(wxEventPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __setattr__(self,name,value): + if name == "m_row" : + windows2c.wxGridEvent_m_row_set(self.this,value) + return + if name == "m_col" : + windows2c.wxGridEvent_m_col_set(self.this,value) + return + if name == "m_x" : + windows2c.wxGridEvent_m_x_set(self.this,value) + return + if name == "m_y" : + windows2c.wxGridEvent_m_y_set(self.this,value) + return + if name == "m_control" : + windows2c.wxGridEvent_m_control_set(self.this,value) + return + if name == "m_shift" : + windows2c.wxGridEvent_m_shift_set(self.this,value) + return + if name == "m_cell" : + windows2c.wxGridEvent_m_cell_set(self.this,value.this) + return + self.__dict__[name] = value + def __getattr__(self,name): + if name == "m_row" : + return windows2c.wxGridEvent_m_row_get(self.this) + if name == "m_col" : + return windows2c.wxGridEvent_m_col_get(self.this) + if name == "m_x" : + return windows2c.wxGridEvent_m_x_get(self.this) + if name == "m_y" : + return windows2c.wxGridEvent_m_y_get(self.this) + if name == "m_control" : + return windows2c.wxGridEvent_m_control_get(self.this) + if name == "m_shift" : + return windows2c.wxGridEvent_m_shift_get(self.this) + if name == "m_cell" : + return wxGridCellPtr(windows2c.wxGridEvent_m_cell_get(self.this)) + raise AttributeError,name + def __repr__(self): + return "" +class wxGridEvent(wxGridEventPtr): + def __init__(self,this): + self.this = this @@ -384,12 +452,18 @@ class wxSplitterWindowPtr(wxWindowPtr): def __init__(self,this): self.this = this self.thisown = 0 + def GetBorderSize(self): + val = windows2c.wxSplitterWindow_GetBorderSize(self.this) + return val def GetMinimumPaneSize(self): val = windows2c.wxSplitterWindow_GetMinimumPaneSize(self.this) return val def GetSashPosition(self): val = windows2c.wxSplitterWindow_GetSashPosition(self.this) return val + def GetSashSize(self): + val = windows2c.wxSplitterWindow_GetSashSize(self.this) + return val def GetSplitMode(self): val = windows2c.wxSplitterWindow_GetSplitMode(self.this) return val @@ -407,9 +481,15 @@ class wxSplitterWindowPtr(wxWindowPtr): def IsSplit(self): val = windows2c.wxSplitterWindow_IsSplit(self.this) return val + def SetBorderSize(self,arg0): + val = windows2c.wxSplitterWindow_SetBorderSize(self.this,arg0) + return val def SetSashPosition(self,arg0,*args): val = apply(windows2c.wxSplitterWindow_SetSashPosition,(self.this,arg0,)+args) return val + def SetSashSize(self,arg0): + val = windows2c.wxSplitterWindow_SetSashSize(self.this,arg0) + return val def SetMinimumPaneSize(self,arg0): val = windows2c.wxSplitterWindow_SetMinimumPaneSize(self.this,arg0) return val @@ -446,6 +526,36 @@ class wxSplitterWindow(wxSplitterWindowPtr): +class wxTaskBarIconPtr(wxEvtHandlerPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def __del__(self): + if self.thisown == 1 : + windows2c.delete_wxTaskBarIcon(self.this) + def SetIcon(self,arg0,*args): + val = apply(windows2c.wxTaskBarIcon_SetIcon,(self.this,arg0.this,)+args) + return val + def RemoveIcon(self): + val = windows2c.wxTaskBarIcon_RemoveIcon(self.this) + return val + def __repr__(self): + return "" +class wxTaskBarIcon(wxTaskBarIconPtr): + def __init__(self) : + self.this = windows2c.new_wxTaskBarIcon() + self.thisown = 1 + wxp._checkForCallback(self, 'OnMouseMove', wxEVT_TASKBAR_MOVE) + wxp._checkForCallback(self, 'OnLButtonDown', wxEVT_TASKBAR_LEFT_DOWN) + wxp._checkForCallback(self, 'OnLButtonUp', wxEVT_TASKBAR_LEFT_UP) + wxp._checkForCallback(self, 'OnRButtonDown', wxEVT_TASKBAR_RIGHT_DOWN) + wxp._checkForCallback(self, 'OnRButtonUp', wxEVT_TASKBAR_RIGHT_UP) + wxp._checkForCallback(self, 'OnLButtonDClick',wxEVT_TASKBAR_LEFT_DCLICK) + wxp._checkForCallback(self, 'OnRButtonDClick',wxEVT_TASKBAR_RIGHT_DCLICK) + + + + #-------------- FUNCTION WRAPPERS ------------------ @@ -457,3 +567,19 @@ class wxSplitterWindow(wxSplitterWindowPtr): wxGRID_TEXT_CTRL = windows2c.wxGRID_TEXT_CTRL wxGRID_HSCROLL = windows2c.wxGRID_HSCROLL wxGRID_VSCROLL = windows2c.wxGRID_VSCROLL +wxEVT_GRID_SELECT_CELL = windows2c.wxEVT_GRID_SELECT_CELL +wxEVT_GRID_CREATE_CELL = windows2c.wxEVT_GRID_CREATE_CELL +wxEVT_GRID_CHANGE_LABELS = windows2c.wxEVT_GRID_CHANGE_LABELS +wxEVT_GRID_CHANGE_SEL_LABEL = windows2c.wxEVT_GRID_CHANGE_SEL_LABEL +wxEVT_GRID_CELL_CHANGE = windows2c.wxEVT_GRID_CELL_CHANGE +wxEVT_GRID_CELL_LCLICK = windows2c.wxEVT_GRID_CELL_LCLICK +wxEVT_GRID_CELL_RCLICK = windows2c.wxEVT_GRID_CELL_RCLICK +wxEVT_GRID_LABEL_LCLICK = windows2c.wxEVT_GRID_LABEL_LCLICK +wxEVT_GRID_LABEL_RCLICK = windows2c.wxEVT_GRID_LABEL_RCLICK +wxEVT_TASKBAR_MOVE = windows2c.wxEVT_TASKBAR_MOVE +wxEVT_TASKBAR_LEFT_DOWN = windows2c.wxEVT_TASKBAR_LEFT_DOWN +wxEVT_TASKBAR_LEFT_UP = windows2c.wxEVT_TASKBAR_LEFT_UP +wxEVT_TASKBAR_RIGHT_DOWN = windows2c.wxEVT_TASKBAR_RIGHT_DOWN +wxEVT_TASKBAR_RIGHT_UP = windows2c.wxEVT_TASKBAR_RIGHT_UP +wxEVT_TASKBAR_LEFT_DCLICK = windows2c.wxEVT_TASKBAR_LEFT_DCLICK +wxEVT_TASKBAR_RIGHT_DCLICK = windows2c.wxEVT_TASKBAR_RIGHT_DCLICK diff --git a/utils/wxPython/src/msw/wxp.cpp b/utils/wxPython/src/msw/wxp.cpp index 3a508f0b77..e9ffc0d211 100644 --- a/utils/wxPython/src/msw/wxp.cpp +++ b/utils/wxPython/src/msw/wxp.cpp @@ -33,8 +33,10 @@ * and things like that. * * $Log$ - * Revision 1.5 1998/11/11 03:12:53 RD - * Additions for wxTreeCtrl + * Revision 1.6 1998/11/25 08:46:46 RD + * Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon + * Added events for wxGrid + * Other various fixes and additions * ************************************************************************/ @@ -605,15 +607,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"; @@ -1757,6 +1758,7 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_signed_long","_long",0); SWIG_RegisterMapping("_wxMenuEvent","_class_wxMenuEvent",0); SWIG_RegisterMapping("_wxFontData","_class_wxFontData",0); + SWIG_RegisterMapping("_class_wxRegionIterator","_wxRegionIterator",0); SWIG_RegisterMapping("_class_wxMenuBar","_wxMenuBar",0); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxPyApp",SwigwxPyAppTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler); @@ -1787,6 +1789,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("_wxPrinterDC","_class_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMenuItem","_wxMenuItem",0); @@ -1816,6 +1819,7 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_uint","_wxWindowID",0); SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0); SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0); + SWIG_RegisterMapping("_wxGridEvent","_class_wxGridEvent",0); SWIG_RegisterMapping("_wxRect","_class_wxRect",0); SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0); SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0); @@ -1825,8 +1829,10 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_wxTreeItemData","_class_wxTreeItemData",0); SWIG_RegisterMapping("_class_wxFontData","_wxFontData",0); SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); + SWIG_RegisterMapping("_wxTaskBarIcon","_class_wxTaskBarIcon",0); SWIG_RegisterMapping("_wxPrintDialog","_class_wxPrintDialog",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("_wxToolBarTool","_class_wxToolBarTool",0); @@ -1844,6 +1850,7 @@ SWIGEXPORT(void,initwxpc)() { 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); @@ -1903,8 +1910,10 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_signed_short","_WXTYPE",0); SWIG_RegisterMapping("_signed_short","_short",0); SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0); + SWIG_RegisterMapping("_class_wxTaskBarIcon","_wxTaskBarIcon",0); SWIG_RegisterMapping("_class_wxPrintDialog","_wxPrintDialog",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("_wxStatusBar","_class_wxStatusBar",0); @@ -1950,9 +1959,11 @@ 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); + SWIG_RegisterMapping("_wxRegionIterator","_class_wxRegionIterator",0); SWIG_RegisterMapping("_class_wxPrinterDC","_wxPrinterDC",0); SWIG_RegisterMapping("_class_wxMDIParentFrame","_wxMDIParentFrame",0); SWIG_RegisterMapping("_class_wxPaintDC","_wxPaintDC",0); @@ -1970,16 +1981,19 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_class_wxColour","_wxColour",0); SWIG_RegisterMapping("_class_wxScreenDC","_wxScreenDC",0); SWIG_RegisterMapping("_class_wxPageSetupDialog","_wxPageSetupDialog",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("_class_wxMiniFrame","_wxMiniFrame",0); SWIG_RegisterMapping("_wxFontDialog","_class_wxFontDialog",0); + SWIG_RegisterMapping("_wxRegion","_class_wxRegion",0); SWIG_RegisterMapping("_class_wxSplitterWindow","_wxSplitterWindow",0); SWIG_RegisterMapping("_class_wxShowEvent","_wxShowEvent",0); SWIG_RegisterMapping("_wxActivateEvent","_class_wxActivateEvent",0); SWIG_RegisterMapping("_wxGauge","_class_wxGauge",0); SWIG_RegisterMapping("_class_wxCheckListBox","_wxCheckListBox",0); + SWIG_RegisterMapping("_class_wxGridEvent","_wxGridEvent",0); SWIG_RegisterMapping("_class_wxCommandEvent","_wxCommandEvent",0); SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0); SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0); @@ -2006,6 +2020,7 @@ SWIGEXPORT(void,initwxpc)() { SWIG_RegisterMapping("_wxKeyEvent","_class_wxKeyEvent",0); SWIG_RegisterMapping("_wxMoveEvent","_class_wxMoveEvent",0); SWIG_RegisterMapping("_wxColourData","_class_wxColourData",0); + SWIG_RegisterMapping("_class_wxPalette","_wxPalette",0); SWIG_RegisterMapping("_class_wxEraseEvent","_wxEraseEvent",0); SWIG_RegisterMapping("_wxMDIClientWindow","_class_wxMDIClientWindow",0); SWIG_RegisterMapping("_class_wxFontDialog","_wxFontDialog",0); diff --git a/utils/wxPython/src/msw/wxp.py b/utils/wxPython/src/msw/wxp.py index 6a169c23dc..72af0862c4 100644 --- a/utils/wxPython/src/msw/wxp.py +++ b/utils/wxPython/src/msw/wxp.py @@ -975,7 +975,7 @@ def EVT_NOTEBOOK_PAGE_CHANGING(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING, func) -#wxTreeCtrl events +# wxTreeCtrl events def EVT_TREE_BEGIN_DRAG(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TREE_BEGIN_DRAG, func) @@ -1019,6 +1019,77 @@ def EVT_TREE_DELETE_ITEM(win, id, func): win.Connect(id, -1, wxEVT_COMMAND_TREE_DELETE_ITEM, func) +# wxSpinButton +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) + + + + +# wxTaskBarIcon +def EVT_TASKBAR_MOVE(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_MOVE, func) + +def EVT_TASKBAR_LEFT_DOWN(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DOWN, func) + +def EVT_TASKBAR_LEFT_UP(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_UP, func) + +def EVT_TASKBAR_RIGHT_DOWN(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DOWN, func) + +def EVT_TASKBAR_RIGHT_UP(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_UP, func) + +def EVT_TASKBAR_LEFT_DCLICK(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_LEFT_DCLICK, func) + +def EVT_TASKBAR_RIGHT_DCLICK(win, func): + win.Connect(-1, -1, wxEVT_TASKBAR_RIGHT_DCLICK, func) + + +# wxGrid +def EVT_GRID_SELECT_CELL(win, fn): + win.Connect(-1, -1, wxEVT_GRID_SELECT_CELL, fn) + +def EVT_GRID_CREATE_CELL(win, fn): + win.Connect(-1, -1, wxEVT_GRID_CREATE_CELL, fn) + +def EVT_GRID_CHANGE_LABELS(win, fn): + win.Connect(-1, -1, wxEVT_GRID_CHANGE_LABELS, fn) + +def EVT_GRID_CHANGE_SEL_LABEL(win, fn): + win.Connect(-1, -1, wxEVT_GRID_CHANGE_SEL_LABEL, fn) + +def EVT_GRID_CELL_CHANGE(win, fn): + win.Connect(-1, -1, wxEVT_GRID_CELL_CHANGE, fn) + +def EVT_GRID_CELL_LCLICK(win, fn): + win.Connect(-1, -1, wxEVT_GRID_CELL_LCLICK, fn) + +def EVT_GRID_CELL_RCLICK(win, fn): + win.Connect(-1, -1, wxEVT_GRID_CELL_RCLICK, fn) + +def EVT_GRID_LABEL_LCLICK(win, fn): + win.Connect(-1, -1, wxEVT_GRID_LABEL_LCLICK, fn) + +def EVT_GRID_LABEL_RCLICK(win, fn): + win.Connect(-1, -1, wxEVT_GRID_LABEL_RCLICK, fn) + + #---------------------------------------------------------------------- @@ -1042,7 +1113,7 @@ NULL = NullObj() #---------------------------------------------------------------------- # aliases -wxColor = wxColour +wxColor = wxColour wxNamedColor = wxNamedColour wxPyDefaultPosition.Set(-1,-1) @@ -1115,8 +1186,13 @@ class wxApp(wxPyApp): #---------------------------------------------------------------------------- # # $Log$ -# Revision 1.5 1998/11/11 03:12:55 RD -# Additions for wxTreeCtrl +# Revision 1.6 1998/11/25 08:46:48 RD +# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon +# Added events for wxGrid +# Other various fixes and additions +# +# 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/my_typemaps.i b/utils/wxPython/src/my_typemaps.i index 77466b712c..475903f3f3 100644 --- a/utils/wxPython/src/my_typemaps.i +++ b/utils/wxPython/src/my_typemaps.i @@ -16,6 +16,7 @@ %{ +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); @@ -34,6 +35,17 @@ extern wxAcceleratorEntry* wxAcceleratorEntry_LIST_helper(PyObject* source); +%typemap(python,in) byte* LIST { + $target = byte_LIST_helper($source); + if ($target == NULL) { + return NULL; + } +} +%typemap(python,freearg) byte* LIST { + delete [] $source; +} + + %typemap(python,in) int* LIST { $target = int_LIST_helper($source); if ($target == NULL) { @@ -186,6 +198,11 @@ static char* wxStringErrorMsg = "string type is required for parameter"; ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.4 1998/11/25 08:45:27 RD +// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon +// Added events for wxGrid +// Other various fixes and additions +// // Revision 1.3 1998/11/15 23:03:47 RD // Removing some ifdef's for wxGTK // diff --git a/utils/wxPython/src/windows2.i b/utils/wxPython/src/windows2.i index d154185afb..40b18656d5 100644 --- a/utils/wxPython/src/windows2.i +++ b/utils/wxPython/src/windows2.i @@ -17,6 +17,9 @@ #include #include #include +#ifdef __WXMSW__ +#include +#endif %} //---------------------------------------------------------------------- @@ -36,35 +39,36 @@ //--------------------------------------------------------------------------- + enum { wxGRID_TEXT_CTRL, wxGRID_HSCROLL, - wxGRID_VSCROLL, + wxGRID_VSCROLL }; - - class wxGridCell { public: + wxGridCell(); + ~wxGridCell(); + wxString& GetTextValue(); - void SetTextValue(const wxString& str); - wxFont *GetFont(); - void SetFont(wxFont *f); + void SetTextValue(const wxString& str); + wxFont* GetFont(); + void SetFont(wxFont *f); wxColour& GetTextColour(); - void SetTextColour(const wxColour& colour); + void SetTextColour(const wxColour& colour); wxColour& GetBackgroundColour(); - void SetBackgroundColour(const wxColour& colour); - wxBrush *GetBackgroundBrush(); - int GetAlignment(); - void SetAlignment(int align); - wxBitmap *GetCellBitmap(); - void SetCellBitmap(wxBitmap *bitmap); + void SetBackgroundColour(const wxColour& colour); + wxBrush* GetBackgroundBrush(); + int GetAlignment(); + void SetAlignment(int align); + wxBitmap* GetCellBitmap(); + void SetCellBitmap(wxBitmap *bitmap); }; - class wxGrid : public wxPanel { public: wxGrid(wxWindow* parent, wxWindowID id, @@ -74,6 +78,16 @@ public: char* name="grid"); %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnSelectCell', wxEVT_GRID_SELECT_CELL)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnCreateCell', wxEVT_GRID_CREATE_CELL)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnChangeLabels', wxEVT_GRID_CHANGE_LABELS)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnChangeSelectionLabel', wxEVT_GRID_CHANGE_SEL_LABEL)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnCellChange', wxEVT_GRID_CELL_CHANGE)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnCellLeftClick', wxEVT_GRID_CELL_LCLICK)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnCellRightClick', wxEVT_GRID_CELL_RCLICK)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLabelLeftClick', wxEVT_GRID_LABEL_LCLICK)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLabelRightClick', wxEVT_GRID_LABEL_RCLICK)" + void AdjustScrollbars(); bool AppendCols(int n=1, bool updateLabels=TRUE); @@ -136,19 +150,7 @@ public: bool InsertCols(int pos=0, int n=1, bool updateLabels=TRUE); bool InsertRows(int pos=0, int n=1, bool updateLabels=TRUE); - // TODO: How to handle callbacks that don't come from - // event system??? - // - //void OnActivate(bool active); - //void OnChangeLabels(); - //void OnChangeSelectionLabel(); - //wxGridCell* OnCreateCell(); - //void OnLeftClick(int row, int col, int x, int y, bool control, bool shift); - //void OnRightClick(int row, int col, int x, int y, bool control, bool shift); - //void OnLabelLeftClick(int row, int col, int x, int y, bool control, bool shift); - //void OnLabelRightClick(int row, int col, int x, int y, bool control, bool shift); - //void OnSelectCell(int row, int col); - //void OnSelectCellImplementation(wxDC *dc, int row, int col); + void OnActivate(bool active); void SetCellAlignment(int alignment, int row, int col); %name(SetDefCellAlignment)void SetCellAlignment(int alignment); @@ -175,6 +177,32 @@ public: void UpdateDimensions(); }; + +class wxGridEvent : public wxEvent { +public: + int m_row; + int m_col; + int m_x; + int m_y; + bool m_control; + bool m_shift; + wxGridCell* m_cell; +}; + + +enum { + wxEVT_GRID_SELECT_CELL, + wxEVT_GRID_CREATE_CELL, + wxEVT_GRID_CHANGE_LABELS, + wxEVT_GRID_CHANGE_SEL_LABEL, + wxEVT_GRID_CELL_CHANGE, + wxEVT_GRID_CELL_LCLICK, + wxEVT_GRID_CELL_RCLICK, + wxEVT_GRID_LABEL_LCLICK, + wxEVT_GRID_LABEL_RCLICK, +}; + + //--------------------------------------------------------------------------- class wxNotebookEvent : public wxCommandEvent { @@ -234,13 +262,15 @@ public: wxSplitterWindow(wxWindow* parent, wxWindowID id, const wxPoint& point = wxPyDefaultPosition, const wxSize& size = wxPyDefaultSize, - long style=wxSP_3D, + long style=wxSP_3D|wxCLIP_CHILDREN, char* name = "splitterWindow"); %pragma(python) addtomethod = "__init__:wxp._StdWindowCallbacks(self)" + int GetBorderSize(); int GetMinimumPaneSize(); int GetSashPosition(); + int GetSashSize(); int GetSplitMode(); wxWindow* GetWindow1(); wxWindow* GetWindow2(); @@ -251,9 +281,12 @@ public: // event system??? // //void OnDoubleClickSash(int x, int y); + //bool OnSashPositionChange(int newSashPosition); //void OnUnsplit(wxWindow* removed); + void SetBorderSize(int width); void SetSashPosition(int position, int redraw = TRUE); + void SetSashSize(int width); void SetMinimumPaneSize(int paneSize); void SetSplitMode(int mode); bool SplitHorizontally(wxWindow* window1, wxWindow* window2, int sashPosition = 0); @@ -263,12 +296,46 @@ public: //--------------------------------------------------------------------------- +#ifdef __WXMSW__ + +enum { + wxEVT_TASKBAR_MOVE, + wxEVT_TASKBAR_LEFT_DOWN, + wxEVT_TASKBAR_LEFT_UP, + wxEVT_TASKBAR_RIGHT_DOWN, + wxEVT_TASKBAR_RIGHT_UP, + wxEVT_TASKBAR_LEFT_DCLICK, + wxEVT_TASKBAR_RIGHT_DCLICK +}; +class wxTaskBarIcon : public wxEvtHandler { +public: + wxTaskBarIcon(); + ~wxTaskBarIcon(); + + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnMouseMove', wxEVT_TASKBAR_MOVE)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLButtonDown', wxEVT_TASKBAR_LEFT_DOWN)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLButtonUp', wxEVT_TASKBAR_LEFT_UP)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnRButtonDown', wxEVT_TASKBAR_RIGHT_DOWN)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnRButtonUp', wxEVT_TASKBAR_RIGHT_UP)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnLButtonDClick',wxEVT_TASKBAR_LEFT_DCLICK)" + %pragma(python) addtomethod = "__init__:wxp._checkForCallback(self, 'OnRButtonDClick',wxEVT_TASKBAR_RIGHT_DCLICK)" + + bool SetIcon(const wxIcon& icon, const char* tooltip = ""); + bool RemoveIcon(void); +}; +#endif + //--------------------------------------------------------------------------- ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.6 1998/11/25 08:45:28 RD +// Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon +// Added events for wxGrid +// Other various fixes and additions +// // Revision 1.5 1998/11/03 09:21:57 RD // fixed a typo // diff --git a/utils/wxPython/tests/bitmaps/smiles.ico b/utils/wxPython/tests/bitmaps/smiles.ico new file mode 100644 index 0000000000000000000000000000000000000000..bb29c8edd7e66d24e5acde41c632ebb805b87891 GIT binary patch literal 766 zcmah{Ic~!+5FEt;0>gz}rHxAeBL12A1hx8wdNzED%9JWo7^Y`-NeVsyue8_f>~eJg z9k0GWK=StieA6GPJ@rKG@JUNy?X?7eH$ren%Md9gdKI$W$XOAUmmry!5-Dq8r!>Z? zBAzxzO$%UbpmkU$zHE6l(2OW(RYUe1r&$ z)Fj+QvAFmA=iIxDWqcdyW1sT2rPo)xMz%;3e5eO~rChb~`%^9A_*2Ywb{KLcM0*hm9^!K!#8l_#G{|IAsMso6S1XX#9x FeFHZg6}12W literal 0 HcmV?d00001 diff --git a/utils/wxPython/tests/test4.py b/utils/wxPython/tests/test4.py index 86449c260b..db3702860d 100644 --- a/utils/wxPython/tests/test4.py +++ b/utils/wxPython/tests/test4.py @@ -197,9 +197,10 @@ class TestLayoutConstraints(wxFrame): #--------------------------------------------------------------------------- class TestGrid(wxFrame): - def __init__(self, parent): + def __init__(self, parent, log): wxFrame.__init__(self, parent, -1, 'Test Grid', wxPyDefaultPosition, wxSize(500, 300)) + self.log = log grid = wxGrid(self, -1) @@ -215,10 +216,27 @@ class TestGrid(wxFrame): grid.UpdateDimensions() grid.AdjustScrollbars() + EVT_GRID_SELECT_CELL(grid, self.OnSelectCell) + EVT_GRID_CELL_CHANGE(grid, self.OnCellChange) + EVT_GRID_CELL_LCLICK(grid, self.OnCellClick) + EVT_GRID_LABEL_LCLICK(grid, self.OnLabelClick) + + def OnCloseWindow(self, event): self.Destroy() + def OnSelectCell(self, event): + self.log.WriteText("OnSelectCell: (%d, %d)\n" % (event.m_row, event.m_col)) + + def OnCellChange(self, event): + self.log.WriteText("OnCellChange: (%d, %d)\n" % (event.m_row, event.m_col)) + + def OnCellClick(self, event): + self.log.WriteText("OnCellClick: (%d, %d)\n" % (event.m_row, event.m_col)) + + def OnLabelClick(self, event): + self.log.WriteText("OnLabelClick: (%d, %d)\n" % (event.m_row, event.m_col)) #--------------------------------------------------------------------------- @@ -633,7 +651,7 @@ class AppFrame(wxFrame): win.Show(true) def OnTestGrid(self, event): - win = TestGrid(self) + win = TestGrid(self, self) win.Show(true) win.SetSize(wxSize(505, 300)) # have to force a resize, or the grid doesn't # show up for some reason.... @@ -785,7 +803,13 @@ if __name__ == '__main__': #---------------------------------------------------------------------------- # # $Log$ +# Revision 1.8 1998/11/25 08:47:11 RD +# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon +# Added events for wxGrid +# Other various fixes and additions +# # Revision 1.7 1998/11/11 03:13:19 RD +# # Additions for wxTreeCtrl # # Revision 1.6 1998/10/20 06:45:33 RD diff --git a/utils/wxPython/tests/test5.py b/utils/wxPython/tests/test5.py new file mode 100644 index 0000000000..396e92a437 --- /dev/null +++ b/utils/wxPython/tests/test5.py @@ -0,0 +1,99 @@ +#!/bin/env python +#---------------------------------------------------------------------------- +# Name: test5.py +# Purpose: Testing wxTaskBarIcon for win32 systems +# +# Author: Robin Dunn +# +# Created: 17-Nov-1998 +# RCS-ID: $Id$ +# Copyright: (c) 1998 by Total Control Software +# Licence: wxWindows license +#---------------------------------------------------------------------------- + + +from wxPython import * + + +#--------------------------------------------------------------------------- + +class MyDialog(wxDialog): + def __init__(self): + wxDialog.__init__(self, NULL, -1, "wxTaskBarIcon Test", + wxPoint(-1,-1), wxSize(380,250), + wxDIALOG_MODELESS|wxDEFAULT_DIALOG_STYLE) + + # build the contents of the Dialog + wxStaticText(self, -1, + "Press OK to hide me, Exit to quit.", + wxPoint(10, 20)) + wxStaticText(self, -1, + "Double-click on the taskbar icon to show me again.", + wxPoint(10, 40)) + + okButton = wxButton(self, wxID_OK, "OK", wxPoint(100, 180), wxSize(80, 25)) + exitButton = wxButton(self, wxID_EXIT, "Exit", wxPoint(185, 180), wxSize(80, 25)) + okButton.SetDefault() + self.Centre(wxBOTH) + + EVT_BUTTON(self, wxID_OK, self.OnOK) + EVT_BUTTON(self, wxID_EXIT, self.OnExit) + + + # make the TaskBar icon + self.tbIcon = wxTaskBarIcon() + icon = wxIcon('bitmaps/smiles.ico', wxBITMAP_TYPE_ICO) + self.tbIcon.SetIcon(icon, "Test ToolTip") + EVT_TASKBAR_LEFT_DCLICK(self.tbIcon, self.OnTaskBarActivate) + + + + def OnTaskBarActivate(self, event): + self.Show(true) + + def OnOK(self, event): + self.Show(false) + + def OnExit(self, event): + self.Close(true) + + def OnCloseWindow(self, event): + self.Destroy() + del self.tbIcon # ensure the tbIcon is cleaned up... + + + +#--------------------------------------------------------------------------- + +class MyApp(wxApp): + def OnInit(self): + self.dlg = MyDialog() + self.dlg.Show(true) + self.SetTopWindow(self.dlg) + return true + +#--------------------------------------------------------------------------- + + +def main(): + app = MyApp(0) + app.MainLoop() + + +def t(): + import pdb + pdb.run('main()') + +if __name__ == '__main__': + main() + + +#---------------------------------------------------------------------------- +# +# $Log$ +# Revision 1.1 1998/11/25 08:47:12 RD +# Added wxPalette, wxRegion, wxRegionIterator, wxTaskbarIcon +# Added events for wxGrid +# Other various fixes and additions +# +# -- 2.45.2