From c95e68d8c78acef24dbb9f4b638efed1548ba9b8 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Thu, 17 Dec 1998 17:53:33 +0000 Subject: [PATCH] wxPython 0.5.2 Minor fixes and SWIG code generation for RR's changes. MSW and GTK versions are much closer now! git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1219 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/wxPython/src/controls.i | 10 + utils/wxPython/src/gtk/cmndlgs.cpp | 260 ++++++++++++++++++- utils/wxPython/src/gtk/cmndlgs.py | 38 ++- utils/wxPython/src/gtk/controls.cpp | 359 +++++++++++++++++++++++++++ utils/wxPython/src/gtk/controls.py | 51 ++++ utils/wxPython/src/gtk/controls2.cpp | 96 ++++++- utils/wxPython/src/gtk/controls2.py | 11 + utils/wxPython/src/gtk/gdi.cpp | 141 ++++++++++- utils/wxPython/src/gtk/gdi.py | 27 +- utils/wxPython/src/gtk/stattool.cpp | 178 ++++++++++++- utils/wxPython/src/gtk/stattool.py | 18 ++ utils/wxPython/src/gtk/windows.cpp | 264 +++++++++++++++++--- utils/wxPython/src/gtk/windows.py | 35 ++- utils/wxPython/src/gtk/wx.cpp | 14 +- utils/wxPython/src/gtk/wx.py | 6 +- utils/wxPython/src/windows.i | 15 +- utils/wxPython/src/wx.i | 8 +- 17 files changed, 1453 insertions(+), 78 deletions(-) diff --git a/utils/wxPython/src/controls.i b/utils/wxPython/src/controls.i index 7b5098130e..cb77a94f30 100644 --- a/utils/wxPython/src/controls.i +++ b/utils/wxPython/src/controls.i @@ -22,6 +22,10 @@ #include #endif #endif + +#ifdef __WXGTK__ +#include +#endif %} //---------------------------------------------------------------------- @@ -479,7 +483,13 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.10 1998/12/17 17:52:19 RD +// wxPython 0.5.2 +// Minor fixes and SWIG code generation for RR's changes. MSW and GTK +// versions are much closer now! +// // Revision 1.9 1998/12/17 14:07:29 RR +// // Removed minor differences between wxMSW and wxGTK // // Revision 1.8 1998/12/15 20:41:15 RD diff --git a/utils/wxPython/src/gtk/cmndlgs.cpp b/utils/wxPython/src/gtk/cmndlgs.cpp index 3ef87d368d..a7cd02a7a4 100644 --- a/utils/wxPython/src/gtk/cmndlgs.cpp +++ b/utils/wxPython/src/gtk/cmndlgs.cpp @@ -384,8 +384,9 @@ static PyObject *_wrap_wxColourDialog_GetColourData(PyObject *self, PyObject *ar return NULL; } } - _result = new wxColourData (wxColourDialog_GetColourData(_arg0)); - SWIG_MakePtr(_ptemp, (void *) _result,"_wxColourData_p"); + wxColourData & _result_ref = wxColourDialog_GetColourData(_arg0); + _result = (wxColourData *) &_result_ref; + SWIG_MakePtr(_ptemp, (char *) _result,"_wxColourData_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } @@ -411,6 +412,234 @@ static PyObject *_wrap_wxColourDialog_ShowModal(PyObject *self, PyObject *args) return _resultobj; } +static void *SwigwxDirDialogTowxDialog(void *ptr) { + wxDirDialog *src; + wxDialog *dest; + src = (wxDirDialog *) ptr; + dest = (wxDialog *) src; + return (void *) dest; +} + +static void *SwigwxDirDialogTowxPanel(void *ptr) { + wxDirDialog *src; + wxPanel *dest; + src = (wxDirDialog *) ptr; + dest = (wxPanel *) src; + return (void *) dest; +} + +static void *SwigwxDirDialogTowxWindow(void *ptr) { + wxDirDialog *src; + wxWindow *dest; + src = (wxDirDialog *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxDirDialogTowxEvtHandler(void *ptr) { + wxDirDialog *src; + wxEvtHandler *dest; + src = (wxDirDialog *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +#define new_wxDirDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4) (new wxDirDialog(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4)) +static PyObject *_wrap_new_wxDirDialog(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxDirDialog * _result; + wxWindow * _arg0; + char * _arg1 = "Choose a directory"; + char * _arg2 = ""; + long _arg3 = 0; + wxPoint * _arg4 = &wxPyDefaultPosition; + char * _argc0 = 0; + char * _argc4 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s|ssls:new_wxDirDialog",&_argc0,&_arg1,&_arg2,&_arg3,&_argc4)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxDirDialog. Expected _wxWindow_p."); + return NULL; + } + } + if (_argc4) { + if (SWIG_GetPtr(_argc4,(void **) &_arg4,"_wxPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of new_wxDirDialog. Expected _wxPoint_p."); + return NULL; + } + } + _result = (wxDirDialog *)new_wxDirDialog(_arg0,_arg1,_arg2,_arg3,*_arg4); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxDirDialog_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxDirDialog_GetPath(_swigobj) (_swigobj->GetPath()) +static PyObject *_wrap_wxDirDialog_GetPath(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxDirDialog * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxDirDialog_GetPath",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_GetPath. Expected _wxDirDialog_p."); + return NULL; + } + } + _result = new wxString (wxDirDialog_GetPath(_arg0)); +{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} + return _resultobj; +} + +#define wxDirDialog_GetMessage(_swigobj) (_swigobj->GetMessage()) +static PyObject *_wrap_wxDirDialog_GetMessage(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxDirDialog * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxDirDialog_GetMessage",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_GetMessage. Expected _wxDirDialog_p."); + return NULL; + } + } + _result = new wxString (wxDirDialog_GetMessage(_arg0)); +{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} + return _resultobj; +} + +#define wxDirDialog_GetStyle(_swigobj) (_swigobj->GetStyle()) +static PyObject *_wrap_wxDirDialog_GetStyle(PyObject *self, PyObject *args) { + PyObject * _resultobj; + long _result; + wxDirDialog * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxDirDialog_GetStyle",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_GetStyle. Expected _wxDirDialog_p."); + return NULL; + } + } + _result = (long )wxDirDialog_GetStyle(_arg0); + _resultobj = Py_BuildValue("l",_result); + return _resultobj; +} + +#define wxDirDialog_SetMessage(_swigobj,_swigarg0) (_swigobj->SetMessage(_swigarg0)) +static PyObject *_wrap_wxDirDialog_SetMessage(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxDirDialog * _arg0; + wxString * _arg1; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sO:wxDirDialog_SetMessage",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_SetMessage. Expected _wxDirDialog_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + wxDirDialog_SetMessage(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxDirDialog_SetPath(_swigobj,_swigarg0) (_swigobj->SetPath(_swigarg0)) +static PyObject *_wrap_wxDirDialog_SetPath(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxDirDialog * _arg0; + wxString * _arg1; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sO:wxDirDialog_SetPath",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_SetPath. Expected _wxDirDialog_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + wxDirDialog_SetPath(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxDirDialog_ShowModal(_swigobj) (_swigobj->ShowModal()) +static PyObject *_wrap_wxDirDialog_ShowModal(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxDirDialog * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxDirDialog_ShowModal",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxDirDialog_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxDirDialog_ShowModal. Expected _wxDirDialog_p."); + return NULL; + } + } + _result = (int )wxDirDialog_ShowModal(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static void *SwigwxFileDialogTowxDialog(void *ptr) { wxFileDialog *src; wxDialog *dest; @@ -3281,6 +3510,13 @@ static PyMethodDef cmndlgscMethods[] = { { "wxFileDialog_GetFilename", _wrap_wxFileDialog_GetFilename, 1 }, { "wxFileDialog_GetDirectory", _wrap_wxFileDialog_GetDirectory, 1 }, { "new_wxFileDialog", _wrap_new_wxFileDialog, 1 }, + { "wxDirDialog_ShowModal", _wrap_wxDirDialog_ShowModal, 1 }, + { "wxDirDialog_SetPath", _wrap_wxDirDialog_SetPath, 1 }, + { "wxDirDialog_SetMessage", _wrap_wxDirDialog_SetMessage, 1 }, + { "wxDirDialog_GetStyle", _wrap_wxDirDialog_GetStyle, 1 }, + { "wxDirDialog_GetMessage", _wrap_wxDirDialog_GetMessage, 1 }, + { "wxDirDialog_GetPath", _wrap_wxDirDialog_GetPath, 1 }, + { "new_wxDirDialog", _wrap_new_wxDirDialog, 1 }, { "wxColourDialog_ShowModal", _wrap_wxColourDialog_ShowModal, 1 }, { "wxColourDialog_GetColourData", _wrap_wxColourDialog_GetColourData, 1 }, { "new_wxColourDialog", _wrap_new_wxColourDialog, 1 }, @@ -3326,6 +3562,8 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_class_wxEvtHandler","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxFileDialog",SwigwxFileDialogTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxFileDialog",SwigwxFileDialogTowxEvtHandler); + SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxDirDialog",SwigwxDirDialogTowxEvtHandler); + SWIG_RegisterMapping("_class_wxEvtHandler","_wxDirDialog",SwigwxDirDialogTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxColourDialog",SwigwxColourDialogTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxColourDialog",SwigwxColourDialogTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxEvtHandler",0); @@ -3360,6 +3598,8 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel); + SWIG_RegisterMapping("_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel); + SWIG_RegisterMapping("_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel); SWIG_RegisterMapping("_wxPanel","_class_wxPanel",0); @@ -3380,6 +3620,8 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_class_wxDialog","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog); SWIG_RegisterMapping("_class_wxDialog","_class_wxFileDialog",SwigwxFileDialogTowxDialog); SWIG_RegisterMapping("_class_wxDialog","_wxFileDialog",SwigwxFileDialogTowxDialog); + SWIG_RegisterMapping("_class_wxDialog","_class_wxDirDialog",SwigwxDirDialogTowxDialog); + SWIG_RegisterMapping("_class_wxDialog","_wxDirDialog",SwigwxDirDialogTowxDialog); SWIG_RegisterMapping("_class_wxDialog","_class_wxColourDialog",SwigwxColourDialogTowxDialog); SWIG_RegisterMapping("_class_wxDialog","_wxColourDialog",SwigwxColourDialogTowxDialog); SWIG_RegisterMapping("_class_wxDialog","_wxDialog",0); @@ -3394,6 +3636,7 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",0); SWIG_RegisterMapping("_wxPrintDialog","_class_wxPrintDialog",0); SWIG_RegisterMapping("_wxPyTimer","_class_wxPyTimer",0); + SWIG_RegisterMapping("_wxWindowDC","_class_wxWindowDC",0); SWIG_RegisterMapping("_wxColourDialog","_class_wxColourDialog",0); SWIG_RegisterMapping("_wxPrintData","_class_wxPrintData",0); SWIG_RegisterMapping("_class_wxIndividualLayoutConstraint","_wxIndividualLayoutConstraint",0); @@ -3408,6 +3651,7 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_unsigned_long","_long",0); SWIG_RegisterMapping("_class_wxRect","_wxRect",0); SWIG_RegisterMapping("_class_wxDC","_wxDC",0); + SWIG_RegisterMapping("_class_wxDirDialog","_wxDirDialog",0); SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0); SWIG_RegisterMapping("_wxAcceleratorEntry","_class_wxAcceleratorEntry",0); SWIG_RegisterMapping("_class_wxPanel","_class_wxMessageDialog",SwigwxMessageDialogTowxPanel); @@ -3424,6 +3668,8 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_class_wxPanel","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxPanel); SWIG_RegisterMapping("_class_wxPanel","_class_wxFileDialog",SwigwxFileDialogTowxPanel); SWIG_RegisterMapping("_class_wxPanel","_wxFileDialog",SwigwxFileDialogTowxPanel); + SWIG_RegisterMapping("_class_wxPanel","_class_wxDirDialog",SwigwxDirDialogTowxPanel); + SWIG_RegisterMapping("_class_wxPanel","_wxDirDialog",SwigwxDirDialogTowxPanel); SWIG_RegisterMapping("_class_wxPanel","_class_wxColourDialog",SwigwxColourDialogTowxPanel); SWIG_RegisterMapping("_class_wxPanel","_wxColourDialog",SwigwxColourDialogTowxPanel); SWIG_RegisterMapping("_class_wxPanel","_wxPanel",0); @@ -3455,6 +3701,8 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_class_wxWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_class_wxFileDialog",SwigwxFileDialogTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxFileDialog",SwigwxFileDialogTowxWindow); + SWIG_RegisterMapping("_class_wxWindow","_class_wxDirDialog",SwigwxDirDialogTowxWindow); + SWIG_RegisterMapping("_class_wxWindow","_wxDirDialog",SwigwxDirDialogTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_class_wxColourDialog",SwigwxColourDialogTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxColourDialog",SwigwxColourDialogTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxWindow",0); @@ -3468,6 +3716,7 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",0); SWIG_RegisterMapping("_class_wxPrintDialog","_wxPrintDialog",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("_wxPostScriptDC","_class_wxPostScriptDC",0); @@ -3492,6 +3741,8 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_wxDialog","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxDialog); SWIG_RegisterMapping("_wxDialog","_class_wxFileDialog",SwigwxFileDialogTowxDialog); SWIG_RegisterMapping("_wxDialog","_wxFileDialog",SwigwxFileDialogTowxDialog); + SWIG_RegisterMapping("_wxDialog","_class_wxDirDialog",SwigwxDirDialogTowxDialog); + SWIG_RegisterMapping("_wxDialog","_wxDirDialog",SwigwxDirDialogTowxDialog); SWIG_RegisterMapping("_wxDialog","_class_wxColourDialog",SwigwxColourDialogTowxDialog); SWIG_RegisterMapping("_wxDialog","_wxColourDialog",SwigwxColourDialogTowxDialog); SWIG_RegisterMapping("_wxDialog","_class_wxDialog",0); @@ -3527,6 +3778,7 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_class_wxBitmap","_wxBitmap",0); SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0); SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0); + SWIG_RegisterMapping("_wxDirDialog","_class_wxDirDialog",0); SWIG_RegisterMapping("_wxEvtHandler","_class_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxMessageDialog",SwigwxMessageDialogTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxPrintDialog",SwigwxPrintDialogTowxEvtHandler); @@ -3541,6 +3793,8 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_wxEvtHandler","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxFileDialog",SwigwxFileDialogTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxFileDialog",SwigwxFileDialogTowxEvtHandler); + SWIG_RegisterMapping("_wxEvtHandler","_class_wxDirDialog",SwigwxDirDialogTowxEvtHandler); + SWIG_RegisterMapping("_wxEvtHandler","_wxDirDialog",SwigwxDirDialogTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxColourDialog",SwigwxColourDialogTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxColourDialog",SwigwxColourDialogTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0); @@ -3568,6 +3822,8 @@ SWIGEXPORT(void,initcmndlgsc)() { SWIG_RegisterMapping("_wxWindow","_wxSingleChoiceDialog",SwigwxSingleChoiceDialogTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxFileDialog",SwigwxFileDialogTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxFileDialog",SwigwxFileDialogTowxWindow); + SWIG_RegisterMapping("_wxWindow","_class_wxDirDialog",SwigwxDirDialogTowxWindow); + SWIG_RegisterMapping("_wxWindow","_wxDirDialog",SwigwxDirDialogTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxColourDialog",SwigwxColourDialogTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxColourDialog",SwigwxColourDialogTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxWindow",0); diff --git a/utils/wxPython/src/gtk/cmndlgs.py b/utils/wxPython/src/gtk/cmndlgs.py index 88675ee1b4..39dd99819e 100644 --- a/utils/wxPython/src/gtk/cmndlgs.py +++ b/utils/wxPython/src/gtk/cmndlgs.py @@ -52,7 +52,6 @@ class wxColourDialogPtr(wxDialogPtr): def GetColourData(self): val = cmndlgsc.wxColourDialog_GetColourData(self.this) val = wxColourDataPtr(val) - val.thisown = 1 return val def ShowModal(self): val = cmndlgsc.wxColourDialog_ShowModal(self.this) @@ -72,6 +71,43 @@ class wxColourDialog(wxColourDialogPtr): +class wxDirDialogPtr(wxDialogPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def GetPath(self): + val = cmndlgsc.wxDirDialog_GetPath(self.this) + return val + def GetMessage(self): + val = cmndlgsc.wxDirDialog_GetMessage(self.this) + return val + def GetStyle(self): + val = cmndlgsc.wxDirDialog_GetStyle(self.this) + return val + def SetMessage(self,arg0): + val = cmndlgsc.wxDirDialog_SetMessage(self.this,arg0) + return val + def SetPath(self,arg0): + val = cmndlgsc.wxDirDialog_SetPath(self.this,arg0) + return val + def ShowModal(self): + val = cmndlgsc.wxDirDialog_ShowModal(self.this) + return val + def __repr__(self): + return "" +class wxDirDialog(wxDirDialogPtr): + def __init__(self,arg0,*args) : + argl = map(None,args) + try: argl[3] = argl[3].this + except: pass + args = tuple(argl) + self.this = apply(cmndlgsc.new_wxDirDialog,(arg0.this,)+args) + self.thisown = 1 + wx._StdDialogCallbacks(self) + + + + class wxFileDialogPtr(wxDialogPtr): def __init__(self,this): self.this = this diff --git a/utils/wxPython/src/gtk/controls.cpp b/utils/wxPython/src/gtk/controls.cpp index 87f3176e57..c02e218e84 100644 --- a/utils/wxPython/src/gtk/controls.cpp +++ b/utils/wxPython/src/gtk/controls.cpp @@ -63,6 +63,10 @@ extern PyObject *SWIG_newvarlink(void); #endif #endif +#ifdef __WXGTK__ +#include +#endif + static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; PyObject* o3; @@ -451,6 +455,165 @@ static PyObject *_wrap_wxBitmapButton_GetBitmapLabel(PyObject *self, PyObject *a return _resultobj; } +#define wxBitmapButton_GetBitmapDisabled(_swigobj) (_swigobj->GetBitmapDisabled()) +static PyObject *_wrap_wxBitmapButton_GetBitmapDisabled(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxBitmap * _result; + wxBitmapButton * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxBitmapButton_GetBitmapDisabled",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_GetBitmapDisabled. Expected _wxBitmapButton_p."); + return NULL; + } + } + wxBitmap & _result_ref = wxBitmapButton_GetBitmapDisabled(_arg0); + _result = (wxBitmap *) &_result_ref; + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxBitmapButton_GetBitmapFocus(_swigobj) (_swigobj->GetBitmapFocus()) +static PyObject *_wrap_wxBitmapButton_GetBitmapFocus(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxBitmap * _result; + wxBitmapButton * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxBitmapButton_GetBitmapFocus",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_GetBitmapFocus. Expected _wxBitmapButton_p."); + return NULL; + } + } + wxBitmap & _result_ref = wxBitmapButton_GetBitmapFocus(_arg0); + _result = (wxBitmap *) &_result_ref; + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxBitmapButton_GetBitmapSelected(_swigobj) (_swigobj->GetBitmapSelected()) +static PyObject *_wrap_wxBitmapButton_GetBitmapSelected(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxBitmap * _result; + wxBitmapButton * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxBitmapButton_GetBitmapSelected",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_GetBitmapSelected. Expected _wxBitmapButton_p."); + return NULL; + } + } + wxBitmap & _result_ref = wxBitmapButton_GetBitmapSelected(_arg0); + _result = (wxBitmap *) &_result_ref; + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxBitmapButton_SetBitmapDisabled(_swigobj,_swigarg0) (_swigobj->SetBitmapDisabled(_swigarg0)) +static PyObject *_wrap_wxBitmapButton_SetBitmapDisabled(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxBitmapButton * _arg0; + wxBitmap * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxBitmapButton_SetBitmapDisabled",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_SetBitmapDisabled. Expected _wxBitmapButton_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmapButton_SetBitmapDisabled. Expected _wxBitmap_p."); + return NULL; + } + } + wxBitmapButton_SetBitmapDisabled(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxBitmapButton_SetBitmapFocus(_swigobj,_swigarg0) (_swigobj->SetBitmapFocus(_swigarg0)) +static PyObject *_wrap_wxBitmapButton_SetBitmapFocus(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxBitmapButton * _arg0; + wxBitmap * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxBitmapButton_SetBitmapFocus",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_SetBitmapFocus. Expected _wxBitmapButton_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmapButton_SetBitmapFocus. Expected _wxBitmap_p."); + return NULL; + } + } + wxBitmapButton_SetBitmapFocus(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxBitmapButton_SetBitmapSelected(_swigobj,_swigarg0) (_swigobj->SetBitmapSelected(_swigarg0)) +static PyObject *_wrap_wxBitmapButton_SetBitmapSelected(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxBitmapButton * _arg0; + wxBitmap * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxBitmapButton_SetBitmapSelected",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBitmapButton_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBitmapButton_SetBitmapSelected. Expected _wxBitmapButton_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBitmapButton_SetBitmapSelected. Expected _wxBitmap_p."); + return NULL; + } + } + wxBitmapButton_SetBitmapSelected(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxBitmapButton_SetBitmapLabel(_swigobj,_swigarg0) (_swigobj->SetBitmapLabel(_swigarg0)) static PyObject *_wrap_wxBitmapButton_SetBitmapLabel(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2592,6 +2755,172 @@ static PyObject *_wrap_wxListBox_SetStringSelection(PyObject *self, PyObject *ar return _resultobj; } +static void *SwigwxCheckListBoxTowxListBox(void *ptr) { + wxCheckListBox *src; + wxListBox *dest; + src = (wxCheckListBox *) ptr; + dest = (wxListBox *) src; + return (void *) dest; +} + +static void *SwigwxCheckListBoxTowxControl(void *ptr) { + wxCheckListBox *src; + wxControl *dest; + src = (wxCheckListBox *) ptr; + dest = (wxControl *) src; + return (void *) dest; +} + +static void *SwigwxCheckListBoxTowxWindow(void *ptr) { + wxCheckListBox *src; + wxWindow *dest; + src = (wxCheckListBox *) ptr; + dest = (wxWindow *) src; + return (void *) dest; +} + +static void *SwigwxCheckListBoxTowxEvtHandler(void *ptr) { + wxCheckListBox *src; + wxEvtHandler *dest; + src = (wxCheckListBox *) ptr; + dest = (wxEvtHandler *) src; + return (void *) dest; +} + +#define new_wxCheckListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8) (new wxCheckListBox(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6,_swigarg7,_swigarg8)) +static PyObject *_wrap_new_wxCheckListBox(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxCheckListBox * _result; + wxWindow * _arg0; + wxWindowID _arg1; + wxPoint * _arg2 = &wxPyDefaultPosition; + wxSize * _arg3 = &wxPyDefaultSize; + int _arg4 = 0; + wxString * _arg5 = NULL; + long _arg6 = 0; + wxValidator * _arg7 = &wxPyDefaultValidator; + char * _arg8 = "listBox"; + char * _argc0 = 0; + char * _argc2 = 0; + char * _argc3 = 0; + PyObject * _obj5 = 0; + char * _argc7 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"si|ssOlss:new_wxCheckListBox",&_argc0,&_arg1,&_argc2,&_argc3,&_obj5,&_arg6,&_argc7,&_arg8)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of new_wxCheckListBox. Expected _wxWindow_p."); + return NULL; + } + } + if (_argc2) { + if (SWIG_GetPtr(_argc2,(void **) &_arg2,"_wxPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of new_wxCheckListBox. Expected _wxPoint_p."); + return NULL; + } + } + if (_argc3) { + if (SWIG_GetPtr(_argc3,(void **) &_arg3,"_wxSize_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of new_wxCheckListBox. Expected _wxSize_p."); + return NULL; + } + } + if (_obj5) +{ + _arg5 = wxString_LIST_helper(_obj5); + if (_arg5 == NULL) { + return NULL; + } +} + if (_argc7) { + if (SWIG_GetPtr(_argc7,(void **) &_arg7,"_wxValidator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 8 of new_wxCheckListBox. Expected _wxValidator_p."); + return NULL; + } + } +{ + _arg4 = PyList_Size(_obj5); +} + _result = (wxCheckListBox *)new_wxCheckListBox(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,_arg6,*_arg7,_arg8); + SWIG_MakePtr(_ptemp, (char *) _result,"_wxCheckListBox_p"); + _resultobj = Py_BuildValue("s",_ptemp); +{ + delete [] _arg5; +} + return _resultobj; +} + +#define wxCheckListBox_IsChecked(_swigobj,_swigarg0) (_swigobj->IsChecked(_swigarg0)) +static PyObject *_wrap_wxCheckListBox_IsChecked(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxCheckListBox * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxCheckListBox_IsChecked",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCheckListBox_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckListBox_IsChecked. Expected _wxCheckListBox_p."); + return NULL; + } + } + _result = (bool )wxCheckListBox_IsChecked(_arg0,_arg1); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxCheckListBox_Check(_swigobj,_swigarg0,_swigarg1) (_swigobj->Check(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxCheckListBox_Check(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxCheckListBox * _arg0; + int _arg1; + bool _arg2 = (1); + char * _argc0 = 0; + int tempbool2; + + self = self; + if(!PyArg_ParseTuple(args,"si|i:wxCheckListBox_Check",&_argc0,&_arg1,&tempbool2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCheckListBox_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckListBox_Check. Expected _wxCheckListBox_p."); + return NULL; + } + } + _arg2 = (bool ) tempbool2; + wxCheckListBox_Check(_arg0,_arg1,_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxCheckListBox_GetItemHeight(_swigobj) (_swigobj->GetItemHeight()) +static PyObject *_wrap_wxCheckListBox_GetItemHeight(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxCheckListBox * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxCheckListBox_GetItemHeight",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxCheckListBox_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxCheckListBox_GetItemHeight. Expected _wxCheckListBox_p."); + return NULL; + } + } + _result = (int )wxCheckListBox_GetItemHeight(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + static void *SwigwxTextCtrlTowxControl(void *ptr) { wxTextCtrl *src; wxControl *dest; @@ -4995,6 +5324,10 @@ static PyMethodDef controlscMethods[] = { { "wxTextCtrl_Copy", _wrap_wxTextCtrl_Copy, 1 }, { "wxTextCtrl_Clear", _wrap_wxTextCtrl_Clear, 1 }, { "new_wxTextCtrl", _wrap_new_wxTextCtrl, 1 }, + { "wxCheckListBox_GetItemHeight", _wrap_wxCheckListBox_GetItemHeight, 1 }, + { "wxCheckListBox_Check", _wrap_wxCheckListBox_Check, 1 }, + { "wxCheckListBox_IsChecked", _wrap_wxCheckListBox_IsChecked, 1 }, + { "new_wxCheckListBox", _wrap_new_wxCheckListBox, 1 }, { "wxListBox_SetStringSelection", _wrap_wxListBox_SetStringSelection, 1 }, { "wxListBox_SetString", _wrap_wxListBox_SetString, 1 }, { "wxListBox_SetSelection", _wrap_wxListBox_SetSelection, 1 }, @@ -5063,6 +5396,12 @@ static PyMethodDef controlscMethods[] = { { "wxCheckBox_GetValue", _wrap_wxCheckBox_GetValue, 1 }, { "new_wxCheckBox", _wrap_new_wxCheckBox, 1 }, { "wxBitmapButton_SetBitmapLabel", _wrap_wxBitmapButton_SetBitmapLabel, 1 }, + { "wxBitmapButton_SetBitmapSelected", _wrap_wxBitmapButton_SetBitmapSelected, 1 }, + { "wxBitmapButton_SetBitmapFocus", _wrap_wxBitmapButton_SetBitmapFocus, 1 }, + { "wxBitmapButton_SetBitmapDisabled", _wrap_wxBitmapButton_SetBitmapDisabled, 1 }, + { "wxBitmapButton_GetBitmapSelected", _wrap_wxBitmapButton_GetBitmapSelected, 1 }, + { "wxBitmapButton_GetBitmapFocus", _wrap_wxBitmapButton_GetBitmapFocus, 1 }, + { "wxBitmapButton_GetBitmapDisabled", _wrap_wxBitmapButton_GetBitmapDisabled, 1 }, { "wxBitmapButton_GetBitmapLabel", _wrap_wxBitmapButton_GetBitmapLabel, 1 }, { "new_wxBitmapButton", _wrap_new_wxBitmapButton, 1 }, { "wxButton_SetDefault", _wrap_wxButton_SetDefault, 1 }, @@ -5106,6 +5445,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxEvtHandler","_wxScrollBar",SwigwxScrollBarTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler); + SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler); + SWIG_RegisterMapping("_class_wxEvtHandler","_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxListBox",SwigwxListBoxTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_wxListBox",SwigwxListBoxTowxEvtHandler); SWIG_RegisterMapping("_class_wxEvtHandler","_class_wxStaticText",SwigwxStaticTextTowxEvtHandler); @@ -5168,6 +5509,7 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0); + SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0); SWIG_RegisterMapping("_wxRect","_class_wxRect",0); SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0); SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0); @@ -5178,6 +5520,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); @@ -5212,6 +5555,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxLayoutConstraints","_class_wxLayoutConstraints",0); SWIG_RegisterMapping("_wxMenu","_class_wxMenu",0); SWIG_RegisterMapping("_class_wxMoveEvent","_wxMoveEvent",0); + SWIG_RegisterMapping("_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox); + SWIG_RegisterMapping("_wxListBox","_wxCheckListBox",SwigwxCheckListBoxTowxListBox); SWIG_RegisterMapping("_wxListBox","_class_wxListBox",0); SWIG_RegisterMapping("_wxScreenDC","_class_wxScreenDC",0); SWIG_RegisterMapping("_WXTYPE","_short",0); @@ -5234,6 +5579,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxWindow","_wxScrollBar",SwigwxScrollBarTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_class_wxTextCtrl",SwigwxTextCtrlTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxTextCtrl",SwigwxTextCtrlTowxWindow); + SWIG_RegisterMapping("_class_wxWindow","_class_wxCheckListBox",SwigwxCheckListBoxTowxWindow); + SWIG_RegisterMapping("_class_wxWindow","_wxCheckListBox",SwigwxCheckListBoxTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_class_wxListBox",SwigwxListBoxTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_wxListBox",SwigwxListBoxTowxWindow); SWIG_RegisterMapping("_class_wxWindow","_class_wxStaticText",SwigwxStaticTextTowxWindow); @@ -5268,6 +5615,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); @@ -5290,6 +5638,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxControl","_wxScrollBar",SwigwxScrollBarTowxControl); SWIG_RegisterMapping("_wxControl","_class_wxTextCtrl",SwigwxTextCtrlTowxControl); SWIG_RegisterMapping("_wxControl","_wxTextCtrl",SwigwxTextCtrlTowxControl); + SWIG_RegisterMapping("_wxControl","_class_wxCheckListBox",SwigwxCheckListBoxTowxControl); + SWIG_RegisterMapping("_wxControl","_wxCheckListBox",SwigwxCheckListBoxTowxControl); SWIG_RegisterMapping("_wxControl","_class_wxListBox",SwigwxListBoxTowxControl); SWIG_RegisterMapping("_wxControl","_wxListBox",SwigwxListBoxTowxControl); SWIG_RegisterMapping("_wxControl","_class_wxStaticText",SwigwxStaticTextTowxControl); @@ -5309,6 +5659,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxControl","_class_wxButton",SwigwxButtonTowxControl); SWIG_RegisterMapping("_wxControl","_wxButton",SwigwxButtonTowxControl); SWIG_RegisterMapping("_wxControl","_class_wxControl",0); + SWIG_RegisterMapping("_class_wxListBox","_class_wxCheckListBox",SwigwxCheckListBoxTowxListBox); + SWIG_RegisterMapping("_class_wxListBox","_wxCheckListBox",SwigwxCheckListBoxTowxListBox); SWIG_RegisterMapping("_class_wxListBox","_wxListBox",0); SWIG_RegisterMapping("_unsigned_int","_uint",0); SWIG_RegisterMapping("_unsigned_int","_wxWindowID",0); @@ -5364,6 +5716,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_class_wxControl","_wxScrollBar",SwigwxScrollBarTowxControl); SWIG_RegisterMapping("_class_wxControl","_class_wxTextCtrl",SwigwxTextCtrlTowxControl); SWIG_RegisterMapping("_class_wxControl","_wxTextCtrl",SwigwxTextCtrlTowxControl); + SWIG_RegisterMapping("_class_wxControl","_class_wxCheckListBox",SwigwxCheckListBoxTowxControl); + SWIG_RegisterMapping("_class_wxControl","_wxCheckListBox",SwigwxCheckListBoxTowxControl); SWIG_RegisterMapping("_class_wxControl","_class_wxListBox",SwigwxListBoxTowxControl); SWIG_RegisterMapping("_class_wxControl","_wxListBox",SwigwxListBoxTowxControl); SWIG_RegisterMapping("_class_wxControl","_class_wxStaticText",SwigwxStaticTextTowxControl); @@ -5395,6 +5749,7 @@ SWIGEXPORT(void,initcontrolsc)() { 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_wxCommandEvent","_wxCommandEvent",0); SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0); SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0); @@ -5416,6 +5771,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxEvtHandler","_wxScrollBar",SwigwxScrollBarTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxTextCtrl",SwigwxTextCtrlTowxEvtHandler); + SWIG_RegisterMapping("_wxEvtHandler","_class_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler); + SWIG_RegisterMapping("_wxEvtHandler","_wxCheckListBox",SwigwxCheckListBoxTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxListBox",SwigwxListBoxTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxListBox",SwigwxListBoxTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxStaticText",SwigwxStaticTextTowxEvtHandler); @@ -5460,6 +5817,8 @@ SWIGEXPORT(void,initcontrolsc)() { SWIG_RegisterMapping("_wxWindow","_wxScrollBar",SwigwxScrollBarTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxTextCtrl",SwigwxTextCtrlTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxTextCtrl",SwigwxTextCtrlTowxWindow); + SWIG_RegisterMapping("_wxWindow","_class_wxCheckListBox",SwigwxCheckListBoxTowxWindow); + SWIG_RegisterMapping("_wxWindow","_wxCheckListBox",SwigwxCheckListBoxTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxListBox",SwigwxListBoxTowxWindow); SWIG_RegisterMapping("_wxWindow","_wxListBox",SwigwxListBoxTowxWindow); SWIG_RegisterMapping("_wxWindow","_class_wxStaticText",SwigwxStaticTextTowxWindow); diff --git a/utils/wxPython/src/gtk/controls.py b/utils/wxPython/src/gtk/controls.py index 9d9947e2b3..e81929ea28 100644 --- a/utils/wxPython/src/gtk/controls.py +++ b/utils/wxPython/src/gtk/controls.py @@ -63,6 +63,27 @@ class wxBitmapButtonPtr(wxButtonPtr): val = controlsc.wxBitmapButton_GetBitmapLabel(self.this) val = wxBitmapPtr(val) return val + def GetBitmapDisabled(self): + val = controlsc.wxBitmapButton_GetBitmapDisabled(self.this) + val = wxBitmapPtr(val) + return val + def GetBitmapFocus(self): + val = controlsc.wxBitmapButton_GetBitmapFocus(self.this) + val = wxBitmapPtr(val) + return val + def GetBitmapSelected(self): + val = controlsc.wxBitmapButton_GetBitmapSelected(self.this) + val = wxBitmapPtr(val) + return val + def SetBitmapDisabled(self,arg0): + val = controlsc.wxBitmapButton_SetBitmapDisabled(self.this,arg0.this) + return val + def SetBitmapFocus(self,arg0): + val = controlsc.wxBitmapButton_SetBitmapFocus(self.this,arg0.this) + return val + def SetBitmapSelected(self,arg0): + val = controlsc.wxBitmapButton_SetBitmapSelected(self.this,arg0.this) + return val def SetBitmapLabel(self,arg0): val = controlsc.wxBitmapButton_SetBitmapLabel(self.this,arg0.this) return val @@ -409,6 +430,36 @@ class wxListBox(wxListBoxPtr): +class wxCheckListBoxPtr(wxListBoxPtr): + def __init__(self,this): + self.this = this + self.thisown = 0 + def IsChecked(self,arg0): + val = controlsc.wxCheckListBox_IsChecked(self.this,arg0) + return val + def Check(self,arg0,*args): + val = apply(controlsc.wxCheckListBox_Check,(self.this,arg0,)+args) + return val + def GetItemHeight(self): + val = controlsc.wxCheckListBox_GetItemHeight(self.this) + return val + def __repr__(self): + return "" +class wxCheckListBox(wxCheckListBoxPtr): + def __init__(self,arg0,arg1,*args) : + argl = map(None,args) + try: argl[0] = argl[0].this + except: pass + try: argl[1] = argl[1].this + except: pass + args = tuple(argl) + self.this = apply(controlsc.new_wxCheckListBox,(arg0.this,arg1,)+args) + self.thisown = 1 + wx._StdWindowCallbacks(self) + + + + class wxTextCtrlPtr(wxControlPtr): def __init__(self,this): self.this = this diff --git a/utils/wxPython/src/gtk/controls2.cpp b/utils/wxPython/src/gtk/controls2.cpp index 7208c92673..f6a7eeaf0d 100644 --- a/utils/wxPython/src/gtk/controls2.cpp +++ b/utils/wxPython/src/gtk/controls2.cpp @@ -694,6 +694,48 @@ static PyObject *_wrap_wxListCtrl_DeleteColumn(PyObject *self, PyObject *args) { return _resultobj; } +#define wxListCtrl_DeleteAllColumns(_swigobj) (_swigobj->DeleteAllColumns()) +static PyObject *_wrap_wxListCtrl_DeleteAllColumns(PyObject *self, PyObject *args) { + PyObject * _resultobj; + bool _result; + wxListCtrl * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxListCtrl_DeleteAllColumns",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_DeleteAllColumns. Expected _wxListCtrl_p."); + return NULL; + } + } + _result = (bool )wxListCtrl_DeleteAllColumns(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxListCtrl_ClearAll(_swigobj) (_swigobj->ClearAll()) +static PyObject *_wrap_wxListCtrl_ClearAll(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxListCtrl * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxListCtrl_ClearAll",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxListCtrl_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxListCtrl_ClearAll. Expected _wxListCtrl_p."); + return NULL; + } + } + wxListCtrl_ClearAll(_arg0); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxListCtrl_EnsureVisible(_swigobj,_swigarg0) (_swigobj->EnsureVisible(_swigarg0)) static PyObject *_wrap_wxListCtrl_EnsureVisible(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2082,7 +2124,7 @@ static void *SwigwxTreeCtrlTowxEvtHandler(void *ptr) { return (void *) dest; } -#define new_wxTreeCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxTreeCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +#define new_wxTreeCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6) (new wxTreeCtrl(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5,_swigarg6)) static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) { PyObject * _resultobj; wxTreeCtrl * _result; @@ -2091,14 +2133,16 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) { wxPoint * _arg2 = &wxPyDefaultPosition; wxSize * _arg3 = &wxPyDefaultSize; long _arg4 = (wxTR_HAS_BUTTONS)|(wxTR_LINES_AT_ROOT); - char * _arg5 = "wxTreeCtrl"; + wxValidator * _arg5 = &wxPyDefaultValidator; + char * _arg6 = "wxTreeCtrl"; char * _argc0 = 0; char * _argc2 = 0; char * _argc3 = 0; + char * _argc5 = 0; char _ptemp[128]; self = self; - if(!PyArg_ParseTuple(args,"s|issls:new_wxTreeCtrl",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_arg5)) + if(!PyArg_ParseTuple(args,"s|isslss:new_wxTreeCtrl",&_argc0,&_arg1,&_argc2,&_argc3,&_arg4,&_argc5,&_arg6)) return NULL; if (_argc0) { if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { @@ -2118,7 +2162,13 @@ static PyObject *_wrap_new_wxTreeCtrl(PyObject *self, PyObject *args) { return NULL; } } - _result = (wxTreeCtrl *)new_wxTreeCtrl(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); + if (_argc5) { + if (SWIG_GetPtr(_argc5,(void **) &_arg5,"_wxValidator_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of new_wxTreeCtrl. Expected _wxValidator_p."); + return NULL; + } + } + _result = (wxTreeCtrl *)new_wxTreeCtrl(_arg0,_arg1,*_arg2,*_arg3,_arg4,*_arg5,_arg6); SWIG_MakePtr(_ptemp, (char *) _result,"_wxTreeCtrl_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; @@ -3619,7 +3669,39 @@ static PyObject *_wrap_wxTreeCtrl_IsBold(PyObject *self, PyObject *args) { return _resultobj; } +#define wxTreeCtrl_HitTest(_swigobj,_swigarg0) (_swigobj->HitTest(_swigarg0)) +static PyObject *_wrap_wxTreeCtrl_HitTest(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxTreeItemId * _result; + wxTreeCtrl * _arg0; + wxPoint * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxTreeCtrl_HitTest",&_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_HitTest. Expected _wxTreeCtrl_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxPoint_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxTreeCtrl_HitTest. Expected _wxPoint_p."); + return NULL; + } + } + _result = new wxTreeItemId (wxTreeCtrl_HitTest(_arg0,*_arg1)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxTreeItemId_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + static PyMethodDef controls2cMethods[] = { + { "wxTreeCtrl_HitTest", _wrap_wxTreeCtrl_HitTest, 1 }, { "wxTreeCtrl_IsBold", _wrap_wxTreeCtrl_IsBold, 1 }, { "wxTreeCtrl_SetItemBold", _wrap_wxTreeCtrl_SetItemBold, 1 }, { "wxTreeCtrl_EndEditLabel", _wrap_wxTreeCtrl_EndEditLabel, 1 }, @@ -3721,6 +3803,8 @@ static PyMethodDef controls2cMethods[] = { { "wxListCtrl_FindItemData", _wrap_wxListCtrl_FindItemData, 1 }, { "wxListCtrl_FindItem", _wrap_wxListCtrl_FindItem, 1 }, { "wxListCtrl_EnsureVisible", _wrap_wxListCtrl_EnsureVisible, 1 }, + { "wxListCtrl_ClearAll", _wrap_wxListCtrl_ClearAll, 1 }, + { "wxListCtrl_DeleteAllColumns", _wrap_wxListCtrl_DeleteAllColumns, 1 }, { "wxListCtrl_DeleteColumn", _wrap_wxListCtrl_DeleteColumn, 1 }, { "wxListCtrl_DeleteAllItems", _wrap_wxListCtrl_DeleteAllItems, 1 }, { "wxListCtrl_DeleteItem", _wrap_wxListCtrl_DeleteItem, 1 }, @@ -3823,6 +3907,7 @@ SWIGEXPORT(void,initcontrols2c)() { SWIG_RegisterMapping("_class_wxEvent","_class_wxListEvent",SwigwxListEventTowxEvent); SWIG_RegisterMapping("_class_wxEvent","_wxListEvent",SwigwxListEventTowxEvent); SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0); + SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0); SWIG_RegisterMapping("_wxRect","_class_wxRect",0); SWIG_RegisterMapping("_wxCommandEvent","_class_wxTreeEvent",SwigwxTreeEventTowxCommandEvent); SWIG_RegisterMapping("_wxCommandEvent","_wxTreeEvent",SwigwxTreeEventTowxCommandEvent); @@ -3836,6 +3921,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); @@ -3899,6 +3985,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); @@ -3973,6 +4060,7 @@ SWIGEXPORT(void,initcontrols2c)() { 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_wxCommandEvent","_class_wxTreeEvent",SwigwxTreeEventTowxCommandEvent); SWIG_RegisterMapping("_class_wxCommandEvent","_wxTreeEvent",SwigwxTreeEventTowxCommandEvent); SWIG_RegisterMapping("_class_wxCommandEvent","_class_wxListEvent",SwigwxListEventTowxCommandEvent); diff --git a/utils/wxPython/src/gtk/controls2.py b/utils/wxPython/src/gtk/controls2.py index 5eefce0c98..22c7cf2b23 100644 --- a/utils/wxPython/src/gtk/controls2.py +++ b/utils/wxPython/src/gtk/controls2.py @@ -150,6 +150,12 @@ class wxListCtrlPtr(wxControlPtr): def DeleteColumn(self,arg0): val = controls2c.wxListCtrl_DeleteColumn(self.this,arg0) return val + def DeleteAllColumns(self): + val = controls2c.wxListCtrl_DeleteAllColumns(self.this) + return val + def ClearAll(self): + val = controls2c.wxListCtrl_ClearAll(self.this) + return val def EnsureVisible(self,arg0): val = controls2c.wxListCtrl_EnsureVisible(self.this,arg0) return val @@ -562,6 +568,11 @@ class wxTreeCtrlPtr(wxControlPtr): def IsBold(self,arg0): val = controls2c.wxTreeCtrl_IsBold(self.this,arg0.this) return val + def HitTest(self,arg0): + val = controls2c.wxTreeCtrl_HitTest(self.this,arg0.this) + val = wxTreeItemIdPtr(val) + val.thisown = 1 + return val def __repr__(self): return "" class wxTreeCtrl(wxTreeCtrlPtr): diff --git a/utils/wxPython/src/gtk/gdi.cpp b/utils/wxPython/src/gtk/gdi.cpp index 0f9b89c248..87f4fd2664 100644 --- a/utils/wxPython/src/gtk/gdi.cpp +++ b/utils/wxPython/src/gtk/gdi.cpp @@ -2349,6 +2349,86 @@ static PyObject *_wrap_wxBrush_Ok(PyObject *self, PyObject *args) { return _resultobj; } +#define wxBrush_SetColour(_swigobj,_swigarg0) (_swigobj->SetColour(_swigarg0)) +static PyObject *_wrap_wxBrush_SetColour(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxBrush * _arg0; + wxColour * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxBrush_SetColour",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetColour. Expected _wxBrush_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxColour_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBrush_SetColour. Expected _wxColour_p."); + return NULL; + } + } + wxBrush_SetColour(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxBrush_SetStipple(_swigobj,_swigarg0) (_swigobj->SetStipple(_swigarg0)) +static PyObject *_wrap_wxBrush_SetStipple(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxBrush * _arg0; + wxBitmap * _arg1; + char * _argc0 = 0; + char * _argc1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"ss:wxBrush_SetStipple",&_argc0,&_argc1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetStipple. Expected _wxBrush_p."); + return NULL; + } + } + if (_argc1) { + if (SWIG_GetPtr(_argc1,(void **) &_arg1,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 2 of wxBrush_SetStipple. Expected _wxBitmap_p."); + return NULL; + } + } + wxBrush_SetStipple(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + +#define wxBrush_SetStyle(_swigobj,_swigarg0) (_swigobj->SetStyle(_swigarg0)) +static PyObject *_wrap_wxBrush_SetStyle(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxBrush * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxBrush_SetStyle",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxBrush_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxBrush_SetStyle. Expected _wxBrush_p."); + return NULL; + } + } + wxBrush_SetStyle(_arg0,_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define delete_wxDC(_swigobj) (delete _swigobj) static PyObject *_wrap_delete_wxDC(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3053,8 +3133,9 @@ static PyObject *_wrap_wxDC_GetBackground(PyObject *self, PyObject *args) { return NULL; } } - _result = new wxBrush (wxDC_GetBackground(_arg0)); - SWIG_MakePtr(_ptemp, (void *) _result,"_wxBrush_p"); + wxBrush & _result_ref = wxDC_GetBackground(_arg0); + _result = (wxBrush *) &_result_ref; + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } @@ -3076,8 +3157,9 @@ static PyObject *_wrap_wxDC_GetBrush(PyObject *self, PyObject *args) { return NULL; } } - _result = new wxBrush (wxDC_GetBrush(_arg0)); - SWIG_MakePtr(_ptemp, (void *) _result,"_wxBrush_p"); + wxBrush & _result_ref = wxDC_GetBrush(_arg0); + _result = (wxBrush *) &_result_ref; + SWIG_MakePtr(_ptemp, (char *) _result,"_wxBrush_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } @@ -3202,8 +3284,9 @@ static PyObject *_wrap_wxDC_GetFont(PyObject *self, PyObject *args) { return NULL; } } - _result = new wxFont (wxDC_GetFont(_arg0)); - SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p"); + wxFont & _result_ref = wxDC_GetFont(_arg0); + _result = (wxFont *) &_result_ref; + SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } @@ -3288,8 +3371,9 @@ static PyObject *_wrap_wxDC_GetPen(PyObject *self, PyObject *args) { return NULL; } } - _result = new wxPen (wxDC_GetPen(_arg0)); - SWIG_MakePtr(_ptemp, (void *) _result,"_wxPen_p"); + wxPen & _result_ref = wxDC_GetPen(_arg0); + _result = (wxPen *) &_result_ref; + SWIG_MakePtr(_ptemp, (char *) _result,"_wxPen_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } @@ -4357,6 +4441,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 *SwigwxPostScriptDCTowxDC(void *ptr) { wxPostScriptDC *src; wxDC *dest; @@ -4576,6 +4691,7 @@ static PyMethodDef gdicMethods[] = { { "delete_wxPalette", _wrap_delete_wxPalette, 1 }, { "new_wxPalette", _wrap_new_wxPalette, 1 }, { "new_wxPostScriptDC", _wrap_new_wxPostScriptDC, 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 }, @@ -4651,6 +4767,9 @@ static PyMethodDef gdicMethods[] = { { "wxDC_Blit", _wrap_wxDC_Blit, 1 }, { "wxDC_BeginDrawing", _wrap_wxDC_BeginDrawing, 1 }, { "delete_wxDC", _wrap_delete_wxDC, 1 }, + { "wxBrush_SetStyle", _wrap_wxBrush_SetStyle, 1 }, + { "wxBrush_SetStipple", _wrap_wxBrush_SetStipple, 1 }, + { "wxBrush_SetColour", _wrap_wxBrush_SetColour, 1 }, { "wxBrush_Ok", _wrap_wxBrush_Ok, 1 }, { "wxBrush_GetStyle", _wrap_wxBrush_GetStyle, 1 }, { "wxBrush_GetStipple", _wrap_wxBrush_GetStipple, 1 }, @@ -4789,6 +4908,8 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_class_wxAcceleratorTable","_wxAcceleratorTable",0); SWIG_RegisterMapping("_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC); SWIG_RegisterMapping("_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC); + 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); @@ -4814,6 +4935,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); @@ -4825,6 +4947,8 @@ SWIGEXPORT(void,initgdic)() { SWIG_RegisterMapping("_class_wxRect","_wxRect",0); SWIG_RegisterMapping("_class_wxDC","_class_wxPostScriptDC",SwigwxPostScriptDCTowxDC); SWIG_RegisterMapping("_class_wxDC","_wxPostScriptDC",SwigwxPostScriptDCTowxDC); + 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); @@ -4855,6 +4979,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("_wxPostScriptDC","_class_wxPostScriptDC",0); diff --git a/utils/wxPython/src/gtk/gdi.py b/utils/wxPython/src/gtk/gdi.py index 840dfb0bf3..81f3b53819 100644 --- a/utils/wxPython/src/gtk/gdi.py +++ b/utils/wxPython/src/gtk/gdi.py @@ -273,6 +273,15 @@ class wxBrushPtr : def Ok(self): val = gdic.wxBrush_Ok(self.this) return val + def SetColour(self,arg0): + val = gdic.wxBrush_SetColour(self.this,arg0.this) + return val + def SetStipple(self,arg0): + val = gdic.wxBrush_SetStipple(self.this,arg0.this) + return val + def SetStyle(self,arg0): + val = gdic.wxBrush_SetStyle(self.this,arg0) + return val def __repr__(self): return "" class wxBrush(wxBrushPtr): @@ -380,12 +389,10 @@ class wxDCPtr : def GetBackground(self): val = gdic.wxDC_GetBackground(self.this) val = wxBrushPtr(val) - val.thisown = 1 return val def GetBrush(self): val = gdic.wxDC_GetBrush(self.this) val = wxBrushPtr(val) - val.thisown = 1 return val def GetCharHeight(self): val = gdic.wxDC_GetCharHeight(self.this) @@ -399,7 +406,6 @@ class wxDCPtr : def GetFont(self): val = gdic.wxDC_GetFont(self.this) val = wxFontPtr(val) - val.thisown = 1 return val def GetLogicalFunction(self): val = gdic.wxDC_GetLogicalFunction(self.this) @@ -413,7 +419,6 @@ class wxDCPtr : def GetPen(self): val = gdic.wxDC_GetPen(self.this) val = wxPenPtr(val) - val.thisown = 1 return val def GetPixel(self,arg0,arg1): val = gdic.wxDC_GetPixel(self.this,arg0,arg1) @@ -593,6 +598,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 wxPostScriptDCPtr(wxDCPtr): def __init__(self,this): self.this = this diff --git a/utils/wxPython/src/gtk/stattool.cpp b/utils/wxPython/src/gtk/stattool.cpp index dc926d3cef..3e69f1f2e0 100644 --- a/utils/wxPython/src/gtk/stattool.cpp +++ b/utils/wxPython/src/gtk/stattool.cpp @@ -932,6 +932,102 @@ static PyObject *_wrap_wxToolBar_GetToolEnabled(PyObject *self, PyObject *args) return _resultobj; } +#define wxToolBar_GetToolLongHelp(_swigobj,_swigarg0) (_swigobj->GetToolLongHelp(_swigarg0)) +static PyObject *_wrap_wxToolBar_GetToolLongHelp(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxToolBar * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolLongHelp",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolLongHelp. Expected _wxToolBar_p."); + return NULL; + } + } + _result = new wxString (wxToolBar_GetToolLongHelp(_arg0,_arg1)); +{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} + return _resultobj; +} + +#define wxToolBar_GetToolPacking(_swigobj) (_swigobj->GetToolPacking()) +static PyObject *_wrap_wxToolBar_GetToolPacking(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxToolBar * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolPacking",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolPacking. Expected _wxToolBar_p."); + return NULL; + } + } + _result = (int )wxToolBar_GetToolPacking(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxToolBar_GetToolSeparation(_swigobj) (_swigobj->GetToolSeparation()) +static PyObject *_wrap_wxToolBar_GetToolSeparation(PyObject *self, PyObject *args) { + PyObject * _resultobj; + int _result; + wxToolBar * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxToolBar_GetToolSeparation",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolSeparation. Expected _wxToolBar_p."); + return NULL; + } + } + _result = (int )wxToolBar_GetToolSeparation(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxToolBar_GetToolShortHelp(_swigobj,_swigarg0) (_swigobj->GetToolShortHelp(_swigarg0)) +static PyObject *_wrap_wxToolBar_GetToolShortHelp(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxToolBar * _arg0; + int _arg1; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"si:wxToolBar_GetToolShortHelp",&_argc0,&_arg1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_GetToolShortHelp. Expected _wxToolBar_p."); + return NULL; + } + } + _result = new wxString (wxToolBar_GetToolShortHelp(_arg0,_arg1)); +{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} + return _resultobj; +} + #define wxToolBar_GetToolState(_swigobj,_swigarg0) (_swigobj->GetToolState(_swigarg0)) static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -957,6 +1053,7 @@ static PyObject *_wrap_wxToolBar_GetToolState(PyObject *self, PyObject *args) { #define wxToolBar_Realize(_swigobj) (_swigobj->Realize()) static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args) { PyObject * _resultobj; + bool _result; wxToolBar * _arg0; char * _argc0 = 0; @@ -969,9 +1066,78 @@ static PyObject *_wrap_wxToolBar_Realize(PyObject *self, PyObject *args) { return NULL; } } - wxToolBar_Realize(_arg0); + _result = (bool )wxToolBar_Realize(_arg0); + _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + +#define wxToolBar_SetToolLongHelp(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetToolLongHelp(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBar_SetToolLongHelp(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxToolBar * _arg0; + int _arg1; + wxString * _arg2; + char * _argc0 = 0; + PyObject * _obj2 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"siO:wxToolBar_SetToolLongHelp",&_argc0,&_arg1,&_obj2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolLongHelp. Expected _wxToolBar_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj2)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg2 = new wxString(PyString_AsString(_obj2)); +} + wxToolBar_SetToolLongHelp(_arg0,_arg1,*_arg2); Py_INCREF(Py_None); _resultobj = Py_None; +{ + if (_obj2) + delete _arg2; +} + return _resultobj; +} + +#define wxToolBar_SetToolShortHelp(_swigobj,_swigarg0,_swigarg1) (_swigobj->SetToolShortHelp(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxToolBar_SetToolShortHelp(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxToolBar * _arg0; + int _arg1; + wxString * _arg2; + char * _argc0 = 0; + PyObject * _obj2 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"siO:wxToolBar_SetToolShortHelp",&_argc0,&_arg1,&_obj2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxToolBar_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBar_SetToolShortHelp. Expected _wxToolBar_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj2)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg2 = new wxString(PyString_AsString(_obj2)); +} + wxToolBar_SetToolShortHelp(_arg0,_arg1,*_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj2) + delete _arg2; +} return _resultobj; } @@ -1078,8 +1244,14 @@ static PyMethodDef stattoolcMethods[] = { { "wxToolBar_SetToolSeparation", _wrap_wxToolBar_SetToolSeparation, 1 }, { "wxToolBar_SetToolPacking", _wrap_wxToolBar_SetToolPacking, 1 }, { "wxToolBar_SetMargins", _wrap_wxToolBar_SetMargins, 1 }, + { "wxToolBar_SetToolShortHelp", _wrap_wxToolBar_SetToolShortHelp, 1 }, + { "wxToolBar_SetToolLongHelp", _wrap_wxToolBar_SetToolLongHelp, 1 }, { "wxToolBar_Realize", _wrap_wxToolBar_Realize, 1 }, { "wxToolBar_GetToolState", _wrap_wxToolBar_GetToolState, 1 }, + { "wxToolBar_GetToolShortHelp", _wrap_wxToolBar_GetToolShortHelp, 1 }, + { "wxToolBar_GetToolSeparation", _wrap_wxToolBar_GetToolSeparation, 1 }, + { "wxToolBar_GetToolPacking", _wrap_wxToolBar_GetToolPacking, 1 }, + { "wxToolBar_GetToolLongHelp", _wrap_wxToolBar_GetToolLongHelp, 1 }, { "wxToolBar_GetToolEnabled", _wrap_wxToolBar_GetToolEnabled, 1 }, { "wxToolBar_EnableTool", _wrap_wxToolBar_EnableTool, 1 }, { "wxToolBar_AddTool", _wrap_wxToolBar_AddTool, 1 }, @@ -1179,6 +1351,7 @@ SWIGEXPORT(void,initstattoolc)() { SWIG_RegisterMapping("_uint","_int",0); SWIG_RegisterMapping("_uint","_wxWindowID",0); SWIG_RegisterMapping("_class_wxEvent","_wxEvent",0); + SWIG_RegisterMapping("_wxCheckListBox","_class_wxCheckListBox",0); SWIG_RegisterMapping("_wxRect","_class_wxRect",0); SWIG_RegisterMapping("_wxCommandEvent","_class_wxCommandEvent",0); SWIG_RegisterMapping("_wxSizeEvent","_class_wxSizeEvent",0); @@ -1187,6 +1360,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); @@ -1249,6 +1423,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); @@ -1316,6 +1491,7 @@ SWIGEXPORT(void,initstattoolc)() { 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_wxCommandEvent","_wxCommandEvent",0); SWIG_RegisterMapping("_class_wxClientDC","_wxClientDC",0); SWIG_RegisterMapping("_class_wxSizeEvent","_wxSizeEvent",0); diff --git a/utils/wxPython/src/gtk/stattool.py b/utils/wxPython/src/gtk/stattool.py index 9e8c7ed4ec..611f76acf2 100644 --- a/utils/wxPython/src/gtk/stattool.py +++ b/utils/wxPython/src/gtk/stattool.py @@ -163,12 +163,30 @@ class wxToolBarPtr(wxControlPtr): def GetToolEnabled(self,arg0): val = stattoolc.wxToolBar_GetToolEnabled(self.this,arg0) return val + def GetToolLongHelp(self,arg0): + val = stattoolc.wxToolBar_GetToolLongHelp(self.this,arg0) + return val + def GetToolPacking(self): + val = stattoolc.wxToolBar_GetToolPacking(self.this) + return val + def GetToolSeparation(self): + val = stattoolc.wxToolBar_GetToolSeparation(self.this) + return val + def GetToolShortHelp(self,arg0): + val = stattoolc.wxToolBar_GetToolShortHelp(self.this,arg0) + return val def GetToolState(self,arg0): val = stattoolc.wxToolBar_GetToolState(self.this,arg0) return val def Realize(self): val = stattoolc.wxToolBar_Realize(self.this) return val + def SetToolLongHelp(self,arg0,arg1): + val = stattoolc.wxToolBar_SetToolLongHelp(self.this,arg0,arg1) + return val + def SetToolShortHelp(self,arg0,arg1): + val = stattoolc.wxToolBar_SetToolShortHelp(self.this,arg0,arg1) + return val def SetMargins(self,arg0): val = stattoolc.wxToolBar_SetMargins(self.this,arg0.this) return val diff --git a/utils/wxPython/src/gtk/windows.cpp b/utils/wxPython/src/gtk/windows.cpp index 756fb28147..3c937f1b85 100644 --- a/utils/wxPython/src/gtk/windows.cpp +++ b/utils/wxPython/src/gtk/windows.cpp @@ -54,15 +54,7 @@ extern PyObject *SWIG_newvarlink(void); #define SWIG_name "windowsc" #include "helpers.h" - -#ifdef __WXMSW__ - // wxGTK defines wxMenuItem inside menu.h #include -#endif - -#ifdef __WXMSW__ -#include -#endif static PyObject* l_output_helper(PyObject* target, PyObject* o) { PyObject* o2; @@ -593,11 +585,7 @@ static PyObject *_wrap_wxWindow_GetClientSizeTuple(PyObject *self, PyObject *arg return _resultobj; } -static wxSize wxWindow_GetClientSize(wxWindow *self) { - int w, h; - self->GetClientSize(&w, &h); - return wxSize(w, h); - } +#define wxWindow_GetClientSize(_swigobj) (_swigobj->GetClientSize()) static PyObject *_wrap_wxWindow_GetClientSize(PyObject *self, PyObject *args) { PyObject * _resultobj; wxSize * _result; @@ -660,8 +648,9 @@ static PyObject *_wrap_wxWindow_GetFont(PyObject *self, PyObject *args) { return NULL; } } - _result = new wxFont (wxWindow_GetFont(_arg0)); - SWIG_MakePtr(_ptemp, (void *) _result,"_wxFont_p"); + wxFont & _result_ref = wxWindow_GetFont(_arg0); + _result = (wxFont *) &_result_ref; + SWIG_MakePtr(_ptemp, (char *) _result,"_wxFont_p"); _resultobj = Py_BuildValue("s",_ptemp); return _resultobj; } @@ -849,6 +838,52 @@ static PyObject *_wrap_wxWindow_GetPositionTuple(PyObject *self, PyObject *args) return _resultobj; } +#define wxWindow_GetPosition(_swigobj) (_swigobj->GetPosition()) +static PyObject *_wrap_wxWindow_GetPosition(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxPoint * _result; + wxWindow * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxWindow_GetPosition",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetPosition. Expected _wxWindow_p."); + return NULL; + } + } + _result = new wxPoint (wxWindow_GetPosition(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxPoint_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +#define wxWindow_GetRect(_swigobj) (_swigobj->GetRect()) +static PyObject *_wrap_wxWindow_GetRect(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxRect * _result; + wxWindow * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxWindow_GetRect",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetRect. Expected _wxWindow_p."); + return NULL; + } + } + _result = new wxRect (wxWindow_GetRect(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxRect_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxWindow_GetReturnCode(_swigobj) (_swigobj->GetReturnCode()) static PyObject *_wrap_wxWindow_GetReturnCode(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -977,6 +1012,29 @@ static PyObject *_wrap_wxWindow_GetSizeTuple(PyObject *self, PyObject *args) { return _resultobj; } +#define wxWindow_GetSize(_swigobj) (_swigobj->GetSize()) +static PyObject *_wrap_wxWindow_GetSize(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxSize * _result; + wxWindow * _arg0; + char * _argc0 = 0; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxWindow_GetSize",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_GetSize. Expected _wxWindow_p."); + return NULL; + } + } + _result = new wxSize (wxWindow_GetSize(_arg0)); + SWIG_MakePtr(_ptemp, (void *) _result,"_wxSize_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + #define wxWindow_GetTextExtent(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->GetTextExtent(_swigarg0,_swigarg1,_swigarg2)) static PyObject *_wrap_wxWindow_GetTextExtent(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -2116,6 +2174,29 @@ static PyObject *_wrap_wxWindow_Validate(PyObject *self, PyObject *args) { return _resultobj; } +#define wxWindow_WarpPointer(_swigobj,_swigarg0,_swigarg1) (_swigobj->WarpPointer(_swigarg0,_swigarg1)) +static PyObject *_wrap_wxWindow_WarpPointer(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxWindow * _arg0; + int _arg1; + int _arg2; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sii:wxWindow_WarpPointer",&_argc0,&_arg1,&_arg2)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxWindow_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxWindow_WarpPointer. Expected _wxWindow_p."); + return NULL; + } + } + wxWindow_WarpPointer(_arg0,_arg1,_arg2); + Py_INCREF(Py_None); + _resultobj = Py_None; + return _resultobj; +} + #define wxWindow_ConvertDialogPointToPixels(_swigobj,_swigarg0) (_swigobj->ConvertDialogToPixels(_swigarg0)) static PyObject *_wrap_wxWindow_ConvertDialogPointToPixels(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3215,6 +3296,66 @@ static PyObject *_wrap_wxMenu_FindItem(PyObject *self, PyObject *args) { return _resultobj; } +#define wxMenu_GetTitle(_swigobj) (_swigobj->GetTitle()) +static PyObject *_wrap_wxMenu_GetTitle(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxMenu * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxMenu_GetTitle",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_GetTitle. Expected _wxMenu_p."); + return NULL; + } + } + _result = new wxString (wxMenu_GetTitle(_arg0)); +{ + _resultobj = PyString_FromString(WXSTRINGCAST *(_result)); +} +{ + delete _result; +} + return _resultobj; +} + +#define wxMenu_SetTitle(_swigobj,_swigarg0) (_swigobj->SetTitle(_swigarg0)) +static PyObject *_wrap_wxMenu_SetTitle(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenu * _arg0; + wxString * _arg1; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sO:wxMenu_SetTitle",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenu_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenu_SetTitle. Expected _wxMenu_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + wxMenu_SetTitle(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + #define wxMenu_FindItemForId(_swigobj,_swigarg0) (_swigobj->FindItemForId(_swigarg0)) static PyObject *_wrap_wxMenu_FindItemForId(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3685,30 +3826,6 @@ static PyObject *_wrap_wxMenuBar_FindMenuItem(PyObject *self, PyObject *args) { return _resultobj; } -#define wxMenuBar_FindItemForId(_swigobj,_swigarg0) (_swigobj->FindMenuItemById(_swigarg0)) -static PyObject *_wrap_wxMenuBar_FindItemForId(PyObject *self, PyObject *args) { - PyObject * _resultobj; - wxMenuItem * _result; - wxMenuBar * _arg0; - int _arg1; - char * _argc0 = 0; - char _ptemp[128]; - - self = self; - if(!PyArg_ParseTuple(args,"si:wxMenuBar_FindItemForId",&_argc0,&_arg1)) - return NULL; - if (_argc0) { - if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuBar_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuBar_FindItemForId. Expected _wxMenuBar_p."); - return NULL; - } - } - _result = (wxMenuItem *)wxMenuBar_FindItemForId(_arg0,_arg1); - SWIG_MakePtr(_ptemp, (char *) _result,"_wxMenuItem_p"); - _resultobj = Py_BuildValue("s",_ptemp); - return _resultobj; -} - #define wxMenuBar_GetMenuCount(_swigobj) (_swigobj->GetMenuCount()) static PyObject *_wrap_wxMenuBar_GetMenuCount(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3882,6 +3999,64 @@ static PyObject *_wrap_wxMenuItem_GetSubMenu(PyObject *self, PyObject *args) { return _resultobj; } +#define wxMenuItem_SetName(_swigobj,_swigarg0) (_swigobj->SetName(_swigarg0)) +static PyObject *_wrap_wxMenuItem_SetName(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxMenuItem * _arg0; + wxString * _arg1; + char * _argc0 = 0; + PyObject * _obj1 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"sO:wxMenuItem_SetName",&_argc0,&_obj1)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_SetName. Expected _wxMenuItem_p."); + return NULL; + } + } +{ + if (!PyString_Check(_obj1)) { + PyErr_SetString(PyExc_TypeError, wxStringErrorMsg); + return NULL; + } + _arg1 = new wxString(PyString_AsString(_obj1)); +} + wxMenuItem_SetName(_arg0,*_arg1); + Py_INCREF(Py_None); + _resultobj = Py_None; +{ + if (_obj1) + delete _arg1; +} + return _resultobj; +} + +#define wxMenuItem_GetName(_swigobj) (_swigobj->GetName()) +static PyObject *_wrap_wxMenuItem_GetName(PyObject *self, PyObject *args) { + PyObject * _resultobj; + wxString * _result; + wxMenuItem * _arg0; + char * _argc0 = 0; + + self = self; + if(!PyArg_ParseTuple(args,"s:wxMenuItem_GetName",&_argc0)) + return NULL; + if (_argc0) { + if (SWIG_GetPtr(_argc0,(void **) &_arg0,"_wxMenuItem_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxMenuItem_GetName. Expected _wxMenuItem_p."); + return NULL; + } + } + const wxString & _result_ref = wxMenuItem_GetName(_arg0); + _result = (wxString *) &_result_ref; +{ + _resultobj = PyString_FromString(WXSTRINGCAST (*_result)); +} + return _resultobj; +} + #define wxMenuItem_GetHelp(_swigobj) (_swigobj->GetHelp()) static PyObject *_wrap_wxMenuItem_GetHelp(PyObject *self, PyObject *args) { PyObject * _resultobj; @@ -3993,6 +4168,8 @@ static PyMethodDef windowscMethods[] = { { "wxMenuItem_Enable", _wrap_wxMenuItem_Enable, 1 }, { "wxMenuItem_SetHelp", _wrap_wxMenuItem_SetHelp, 1 }, { "wxMenuItem_GetHelp", _wrap_wxMenuItem_GetHelp, 1 }, + { "wxMenuItem_GetName", _wrap_wxMenuItem_GetName, 1 }, + { "wxMenuItem_SetName", _wrap_wxMenuItem_SetName, 1 }, { "wxMenuItem_GetSubMenu", _wrap_wxMenuItem_GetSubMenu, 1 }, { "wxMenuItem_GetId", _wrap_wxMenuItem_GetId, 1 }, { "wxMenuItem_IsCheckable", _wrap_wxMenuItem_IsCheckable, 1 }, @@ -4001,7 +4178,6 @@ static PyMethodDef windowscMethods[] = { { "wxMenuItem_IsSeparator", _wrap_wxMenuItem_IsSeparator, 1 }, { "wxMenuBar_GetMenu", _wrap_wxMenuBar_GetMenu, 1 }, { "wxMenuBar_GetMenuCount", _wrap_wxMenuBar_GetMenuCount, 1 }, - { "wxMenuBar_FindItemForId", _wrap_wxMenuBar_FindItemForId, 1 }, { "wxMenuBar_FindMenuItem", _wrap_wxMenuBar_FindMenuItem, 1 }, { "wxMenuBar_Enabled", _wrap_wxMenuBar_Enabled, 1 }, { "wxMenuBar_Enable", _wrap_wxMenuBar_Enable, 1 }, @@ -4018,6 +4194,8 @@ static PyMethodDef windowscMethods[] = { { "wxMenu_GetLabel", _wrap_wxMenu_GetLabel, 1 }, { "wxMenu_GetHelpString", _wrap_wxMenu_GetHelpString, 1 }, { "wxMenu_FindItemForId", _wrap_wxMenu_FindItemForId, 1 }, + { "wxMenu_SetTitle", _wrap_wxMenu_SetTitle, 1 }, + { "wxMenu_GetTitle", _wrap_wxMenu_GetTitle, 1 }, { "wxMenu_FindItem", _wrap_wxMenu_FindItem, 1 }, { "wxMenu_Enable", _wrap_wxMenu_Enable, 1 }, { "wxMenu_Check", _wrap_wxMenu_Check, 1 }, @@ -4052,6 +4230,7 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_ConvertPixelPointToDialog", _wrap_wxWindow_ConvertPixelPointToDialog, 1 }, { "wxWindow_ConvertDialogSizeToPixels", _wrap_wxWindow_ConvertDialogSizeToPixels, 1 }, { "wxWindow_ConvertDialogPointToPixels", _wrap_wxWindow_ConvertDialogPointToPixels, 1 }, + { "wxWindow_WarpPointer", _wrap_wxWindow_WarpPointer, 1 }, { "wxWindow_Validate", _wrap_wxWindow_Validate, 1 }, { "wxWindow_TransferDataToWindow", _wrap_wxWindow_TransferDataToWindow, 1 }, { "wxWindow_TransferDataFromWindow", _wrap_wxWindow_TransferDataFromWindow, 1 }, @@ -4094,11 +4273,14 @@ static PyMethodDef windowscMethods[] = { { "wxWindow_GetWindowStyleFlag", _wrap_wxWindow_GetWindowStyleFlag, 1 }, { "wxWindow_GetTitle", _wrap_wxWindow_GetTitle, 1 }, { "wxWindow_GetTextExtent", _wrap_wxWindow_GetTextExtent, 1 }, + { "wxWindow_GetSize", _wrap_wxWindow_GetSize, 1 }, { "wxWindow_GetSizeTuple", _wrap_wxWindow_GetSizeTuple, 1 }, { "wxWindow_GetScrollRange", _wrap_wxWindow_GetScrollRange, 1 }, { "wxWindow_GetScrollPos", _wrap_wxWindow_GetScrollPos, 1 }, { "wxWindow_GetScrollThumb", _wrap_wxWindow_GetScrollThumb, 1 }, { "wxWindow_GetReturnCode", _wrap_wxWindow_GetReturnCode, 1 }, + { "wxWindow_GetRect", _wrap_wxWindow_GetRect, 1 }, + { "wxWindow_GetPosition", _wrap_wxWindow_GetPosition, 1 }, { "wxWindow_GetPositionTuple", _wrap_wxWindow_GetPositionTuple, 1 }, { "wxWindow_GetParent", _wrap_wxWindow_GetParent, 1 }, { "wxWindow_GetName", _wrap_wxWindow_GetName, 1 }, @@ -4188,6 +4370,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); @@ -4232,6 +4415,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("_wxPostScriptDC","_class_wxPostScriptDC",0); diff --git a/utils/wxPython/src/gtk/windows.py b/utils/wxPython/src/gtk/windows.py index 835c542d4f..d94d67f061 100644 --- a/utils/wxPython/src/gtk/windows.py +++ b/utils/wxPython/src/gtk/windows.py @@ -93,7 +93,6 @@ class wxWindowPtr(wxEvtHandlerPtr): def GetFont(self): val = windowsc.wxWindow_GetFont(self.this) val = wxFontPtr(val) - val.thisown = 1 return val def GetForegroundColour(self): val = windowsc.wxWindow_GetForegroundColour(self.this) @@ -120,6 +119,16 @@ class wxWindowPtr(wxEvtHandlerPtr): def GetPositionTuple(self): val = windowsc.wxWindow_GetPositionTuple(self.this) return val + def GetPosition(self): + val = windowsc.wxWindow_GetPosition(self.this) + val = wxPointPtr(val) + val.thisown = 1 + return val + def GetRect(self): + val = windowsc.wxWindow_GetRect(self.this) + val = wxRectPtr(val) + val.thisown = 1 + return val def GetReturnCode(self): val = windowsc.wxWindow_GetReturnCode(self.this) return val @@ -135,6 +144,11 @@ class wxWindowPtr(wxEvtHandlerPtr): def GetSizeTuple(self): val = windowsc.wxWindow_GetSizeTuple(self.this) return val + def GetSize(self): + val = windowsc.wxWindow_GetSize(self.this) + val = wxSizePtr(val) + val.thisown = 1 + return val def GetTextExtent(self,arg0): val = windowsc.wxWindow_GetTextExtent(self.this,arg0) return val @@ -269,6 +283,9 @@ class wxWindowPtr(wxEvtHandlerPtr): def Validate(self): val = windowsc.wxWindow_Validate(self.this) return val + def WarpPointer(self,arg0,arg1): + val = windowsc.wxWindow_WarpPointer(self.this,arg0,arg1) + return val def ConvertDialogPointToPixels(self,arg0): val = windowsc.wxWindow_ConvertDialogPointToPixels(self.this,arg0.this) val = wxPointPtr(val) @@ -452,6 +469,12 @@ class wxMenuPtr(wxEvtHandlerPtr): def FindItem(self,arg0): val = windowsc.wxMenu_FindItem(self.this,arg0) return val + def GetTitle(self): + val = windowsc.wxMenu_GetTitle(self.this) + return val + def SetTitle(self,arg0): + val = windowsc.wxMenu_SetTitle(self.this,arg0) + return val def FindItemForId(self,arg0): val = windowsc.wxMenu_FindItemForId(self.this,arg0) val = wxMenuItemPtr(val) @@ -523,10 +546,6 @@ class wxMenuBarPtr(wxEvtHandlerPtr): def FindMenuItem(self,arg0,arg1): val = windowsc.wxMenuBar_FindMenuItem(self.this,arg0,arg1) return val - def FindItemForId(self,arg0): - val = windowsc.wxMenuBar_FindItemForId(self.this,arg0) - val = wxMenuItemPtr(val) - return val def GetMenuCount(self): val = windowsc.wxMenuBar_GetMenuCount(self.this) return val @@ -567,6 +586,12 @@ class wxMenuItemPtr : val = windowsc.wxMenuItem_GetSubMenu(self.this) val = wxMenuPtr(val) return val + def SetName(self,arg0): + val = windowsc.wxMenuItem_SetName(self.this,arg0) + return val + def GetName(self): + val = windowsc.wxMenuItem_GetName(self.this) + return val def GetHelp(self): val = windowsc.wxMenuItem_GetHelp(self.this) return val diff --git a/utils/wxPython/src/gtk/wx.cpp b/utils/wxPython/src/gtk/wx.cpp index f1fb860524..48d99db0f0 100644 --- a/utils/wxPython/src/gtk/wx.cpp +++ b/utils/wxPython/src/gtk/wx.cpp @@ -33,8 +33,10 @@ * and things like that. * * $Log$ - * Revision 1.2 1998/12/16 22:12:20 RD - * Tweaks needed to be able to build wxPython with wxGTK. + * Revision 1.3 1998/12/17 17:53:31 RD + * wxPython 0.5.2 + * Minor fixes and SWIG code generation for RR's changes. MSW and GTK + * versions are much closer now! * ************************************************************************/ @@ -1677,7 +1679,7 @@ SWIGEXPORT(void,initwxc)() { PyDict_SetItemString(d,"wxEVT_COMMAND_TAB_SEL_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_TAB_SEL_CHANGING)); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGED)); PyDict_SetItemString(d,"wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING", PyInt_FromLong((long) wxEVT_COMMAND_NOTEBOOK_PAGE_CHANGING)); - PyDict_SetItemString(d,"__version__", PyString_FromString("0.5.1")); + PyDict_SetItemString(d,"__version__", PyString_FromString("0.5.2")); PyDict_SetItemString(d,"cvar", SWIG_globals); SWIG_addvarlink(SWIG_globals,"wxPyDefaultPosition",_wrap_wxPyDefaultPosition_get, _wrap_wxPyDefaultPosition_set); SWIG_addvarlink(SWIG_globals,"wxPyDefaultSize",_wrap_wxPyDefaultSize_get, _wrap_wxPyDefaultSize_set); @@ -1774,6 +1776,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_uint","_int",0); 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); @@ -1786,6 +1789,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_wxBitmap","_class_wxBitmap",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); @@ -1817,6 +1821,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_wxPyApp","_class_wxPyApp",0); SWIG_RegisterMapping("_wxMDIParentFrame","_class_wxMDIParentFrame",0); SWIG_RegisterMapping("_class_wxTreeEvent","_wxTreeEvent",0); + SWIG_RegisterMapping("_class_wxDirDialog","_wxDirDialog",0); SWIG_RegisterMapping("_class_wxPyTimer","_wxPyTimer",0); SWIG_RegisterMapping("_wxFocusEvent","_class_wxFocusEvent",0); SWIG_RegisterMapping("_wxMaximizeEvent","_class_wxMaximizeEvent",0); @@ -1864,6 +1869,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_wxMemoryDC","_class_wxMemoryDC",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); @@ -1941,6 +1947,7 @@ SWIGEXPORT(void,initwxc)() { 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); @@ -1953,6 +1960,7 @@ SWIGEXPORT(void,initwxc)() { SWIG_RegisterMapping("_class_wxMemoryDC","_wxMemoryDC",0); SWIG_RegisterMapping("_wxMenuBar","_class_wxMenuBar",0); SWIG_RegisterMapping("_wxTreeEvent","_class_wxTreeEvent",0); + SWIG_RegisterMapping("_wxDirDialog","_class_wxDirDialog",0); SWIG_RegisterMapping("_wxEvtHandler","_class_wxPyApp",SwigwxPyAppTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_wxPyApp",SwigwxPyAppTowxEvtHandler); SWIG_RegisterMapping("_wxEvtHandler","_class_wxEvtHandler",0); diff --git a/utils/wxPython/src/gtk/wx.py b/utils/wxPython/src/gtk/wx.py index d761711eeb..bd4092a51c 100644 --- a/utils/wxPython/src/gtk/wx.py +++ b/utils/wxPython/src/gtk/wx.py @@ -1183,8 +1183,10 @@ class wxApp(wxPyApp): #---------------------------------------------------------------------------- # # $Log$ -# Revision 1.2 1998/12/16 22:12:22 RD -# Tweaks needed to be able to build wxPython with wxGTK. +# Revision 1.3 1998/12/17 17:53:33 RD +# wxPython 0.5.2 +# Minor fixes and SWIG code generation for RR's changes. MSW and GTK +# versions are much closer now! # # Revision 1.7 1998/11/25 08:45:21 RD # diff --git a/utils/wxPython/src/windows.i b/utils/wxPython/src/windows.i index 6946b45cd7..1d5140a1ff 100644 --- a/utils/wxPython/src/windows.i +++ b/utils/wxPython/src/windows.i @@ -15,12 +15,7 @@ %{ #include "helpers.h" - #include - -#ifdef __WXMSW__ -#include // needed ? -#endif %} //---------------------------------------------------------------------- @@ -315,8 +310,8 @@ public: void Enable(int id, bool enable); bool Enabled(int id); int FindMenuItem(const wxString& menuString, const wxString& itemString); - wxMenuItem * FindItemForId(int id); #ifdef __WXMSW__ + wxMenuItem * FindItemForId(int id); void EnableTop(int pos, bool enable); wxString GetHelpString(int id); wxString GetLabel(int id); @@ -346,7 +341,7 @@ public: void SetHelp(const wxString& strHelp); void Enable(bool bDoEnable = TRUE); void Check(bool bDoCheck = TRUE); - + #ifdef __WXMSW__ void DeleteSubMenu(); #endif @@ -356,7 +351,13 @@ public: ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.10 1998/12/17 17:52:20 RD +// wxPython 0.5.2 +// Minor fixes and SWIG code generation for RR's changes. MSW and GTK +// versions are much closer now! +// // Revision 1.9 1998/12/17 14:07:46 RR +// // Removed minor differences between wxMSW and wxGTK // // Revision 1.8 1998/12/16 22:10:56 RD diff --git a/utils/wxPython/src/wx.i b/utils/wxPython/src/wx.i index aeb3c9b49c..cedd7db22d 100644 --- a/utils/wxPython/src/wx.i +++ b/utils/wxPython/src/wx.i @@ -46,7 +46,7 @@ //--------------------------------------------------------------------------- -#define __version__ "0.5.1" +#define __version__ "0.5.2" wxPoint wxPyDefaultPosition; wxSize wxPyDefaultSize; @@ -152,7 +152,13 @@ extern "C" SWIGEXPORT(void,initutilsc)(); ///////////////////////////////////////////////////////////////////////////// // // $Log$ +// Revision 1.3 1998/12/17 17:52:21 RD +// wxPython 0.5.2 +// Minor fixes and SWIG code generation for RR's changes. MSW and GTK +// versions are much closer now! +// // Revision 1.2 1998/12/16 22:10:57 RD +// // Tweaks needed to be able to build wxPython with wxGTK. // // Revision 1.1 1998/12/15 20:41:27 RD