From: Robin Dunn Date: Tue, 26 Mar 2002 22:06:04 +0000 (+0000) Subject: Updates to match recent CVS changes. X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/be86ffe39e36bd165efdd118a8782959432b1a08 Updates to match recent CVS changes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14811 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/wxPython/src/gtk/image.cpp b/wxPython/src/gtk/image.cpp index 4909ae75b1..9d2e48d4f0 100644 --- a/wxPython/src/gtk/image.cpp +++ b/wxPython/src/gtk/image.cpp @@ -100,7 +100,7 @@ static PyObject* t_output_helper(PyObject* target, PyObject* o) { wxImage* wxImageFromBitmap(const wxBitmap &bitmap) { - return new wxImage(bitmap); + return new wxImage(bitmap.ConvertToImage()); } @@ -1333,69 +1333,6 @@ static PyObject *_wrap_delete_wxImage(PyObject *self, PyObject *args, PyObject * return _resultobj; } -#define wxImage_ConvertToBitmap(_swigobj) (_swigobj->ConvertToBitmap()) -static PyObject *_wrap_wxImage_ConvertToBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxBitmap * _result; - wxImage * _arg0; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self", NULL }; - char _ptemp[128]; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_ConvertToBitmap",_kwnames,&_argo0)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_ConvertToBitmap. Expected _wxImage_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxBitmap (wxImage_ConvertToBitmap(_arg0)); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} SWIG_MakePtr(_ptemp, (void *) _result,"_wxBitmap_p"); - _resultobj = Py_BuildValue("s",_ptemp); - return _resultobj; -} - -#define wxImage_ConvertToMonoBitmap(_swigobj,_swigarg0,_swigarg1,_swigarg2) (_swigobj->ConvertToMonoBitmap(_swigarg0,_swigarg1,_swigarg2)) -static PyObject *_wrap_wxImage_ConvertToMonoBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxBitmap * _result; - wxImage * _arg0; - unsigned char _arg1; - unsigned char _arg2; - unsigned char _arg3; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","red","green","blue", NULL }; - char _ptemp[128]; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Obbb:wxImage_ConvertToMonoBitmap",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_ConvertToMonoBitmap. Expected _wxImage_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxBitmap (wxImage_ConvertToMonoBitmap(_arg0,_arg1,_arg2,_arg3)); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} SWIG_MakePtr(_ptemp, (void *) _result,"_wxBitmap_p"); - _resultobj = Py_BuildValue("s",_ptemp); - return _resultobj; -} - #define wxImage_Create(_swigobj,_swigarg0,_swigarg1) (_swigobj->Create(_swigarg0,_swigarg1)) static PyObject *_wrap_wxImage_Create(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -2995,7 +2932,79 @@ static PyObject *_wrap_wxImage_RemoveHandler(PyObject *self, PyObject *args, PyO return _resultobj; } +static wxBitmap wxImage_ConvertToBitmap(wxImage *self) { + wxBitmap bitmap(*self); + return bitmap; + } +static PyObject *_wrap_wxImage_ConvertToBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBitmap * _result; + wxImage * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxImage_ConvertToBitmap",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_ConvertToBitmap. Expected _wxImage_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxBitmap (wxImage_ConvertToBitmap(_arg0)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + +static wxBitmap wxImage_ConvertToMonoBitmap(wxImage *self,unsigned char red,unsigned char green,unsigned char blue) { + wxImage mono = self->ConvertToMono( red, green, blue ); + wxBitmap bitmap( mono, 1 ); + return bitmap; + } +static PyObject *_wrap_wxImage_ConvertToMonoBitmap(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxBitmap * _result; + wxImage * _arg0; + unsigned char _arg1; + unsigned char _arg2; + unsigned char _arg3; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self","red","green","blue", NULL }; + char _ptemp[128]; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Obbb:wxImage_ConvertToMonoBitmap",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxImage_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxImage_ConvertToMonoBitmap. Expected _wxImage_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = new wxBitmap (wxImage_ConvertToMonoBitmap(_arg0,_arg1,_arg2,_arg3)); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} SWIG_MakePtr(_ptemp, (void *) _result,"_wxBitmap_p"); + _resultobj = Py_BuildValue("s",_ptemp); + return _resultobj; +} + static PyMethodDef imagecMethods[] = { + { "wxImage_ConvertToMonoBitmap", (PyCFunction) _wrap_wxImage_ConvertToMonoBitmap, METH_VARARGS | METH_KEYWORDS }, + { "wxImage_ConvertToBitmap", (PyCFunction) _wrap_wxImage_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS }, { "wxImage_RemoveHandler", (PyCFunction) _wrap_wxImage_RemoveHandler, METH_VARARGS | METH_KEYWORDS }, { "wxImage_InsertHandler", (PyCFunction) _wrap_wxImage_InsertHandler, METH_VARARGS | METH_KEYWORDS }, { "wxImage_AddHandler", (PyCFunction) _wrap_wxImage_AddHandler, METH_VARARGS | METH_KEYWORDS }, @@ -3041,8 +3050,6 @@ static PyMethodDef imagecMethods[] = { { "wxImage_Scale", (PyCFunction) _wrap_wxImage_Scale, METH_VARARGS | METH_KEYWORDS }, { "wxImage_Destroy", (PyCFunction) _wrap_wxImage_Destroy, METH_VARARGS | METH_KEYWORDS }, { "wxImage_Create", (PyCFunction) _wrap_wxImage_Create, METH_VARARGS | METH_KEYWORDS }, - { "wxImage_ConvertToMonoBitmap", (PyCFunction) _wrap_wxImage_ConvertToMonoBitmap, METH_VARARGS | METH_KEYWORDS }, - { "wxImage_ConvertToBitmap", (PyCFunction) _wrap_wxImage_ConvertToBitmap, METH_VARARGS | METH_KEYWORDS }, { "delete_wxImage", (PyCFunction) _wrap_delete_wxImage, METH_VARARGS | METH_KEYWORDS }, { "new_wxImage", (PyCFunction) _wrap_new_wxImage, METH_VARARGS | METH_KEYWORDS }, { "new_wxTIFFHandler", (PyCFunction) _wrap_new_wxTIFFHandler, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/gtk/image.py b/wxPython/src/gtk/image.py index fc444a461a..8f88163842 100644 --- a/wxPython/src/gtk/image.py +++ b/wxPython/src/gtk/image.py @@ -193,14 +193,6 @@ class wxImagePtr(wxObjectPtr): def __del__(self,imagec=imagec): if self.thisown == 1 : imagec.delete_wxImage(self) - def ConvertToBitmap(self, *_args, **_kwargs): - val = apply(imagec.wxImage_ConvertToBitmap,(self,) + _args, _kwargs) - if val: val = wxBitmapPtr(val) ; val.thisown = 1 - return val - def ConvertToMonoBitmap(self, *_args, **_kwargs): - val = apply(imagec.wxImage_ConvertToMonoBitmap,(self,) + _args, _kwargs) - if val: val = wxBitmapPtr(val) ; val.thisown = 1 - return val def Create(self, *_args, **_kwargs): val = apply(imagec.wxImage_Create,(self,) + _args, _kwargs) return val @@ -326,6 +318,14 @@ class wxImagePtr(wxObjectPtr): def CountColours(self, *_args, **_kwargs): val = apply(imagec.wxImage_CountColours,(self,) + _args, _kwargs) return val + def ConvertToBitmap(self, *_args, **_kwargs): + val = apply(imagec.wxImage_ConvertToBitmap,(self,) + _args, _kwargs) + if val: val = wxBitmapPtr(val) ; val.thisown = 1 + return val + def ConvertToMonoBitmap(self, *_args, **_kwargs): + val = apply(imagec.wxImage_ConvertToMonoBitmap,(self,) + _args, _kwargs) + if val: val = wxBitmapPtr(val) ; val.thisown = 1 + return val def __repr__(self): return "" % (self.this,) class wxImage(wxImagePtr): diff --git a/wxPython/src/gtk/misc2.cpp b/wxPython/src/gtk/misc2.cpp index 96eeaaf25d..278831fd2a 100644 --- a/wxPython/src/gtk/misc2.cpp +++ b/wxPython/src/gtk/misc2.cpp @@ -2184,11 +2184,11 @@ static PyObject *_wrap_wxExecute(PyObject *self, PyObject *args, PyObject *kwarg PyObject * _resultobj; long _result; wxString * _arg0; - int _arg1 = (int ) FALSE; + int _arg1 = (int ) (wxEXEC_ASYNC); wxPyProcess * _arg2 = (wxPyProcess *) NULL; PyObject * _obj0 = 0; PyObject * _argo2 = 0; - char *_kwnames[] = { "command","sync","process", NULL }; + char *_kwnames[] = { "command","flags","process", NULL }; self = self; if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|iO:wxExecute",_kwnames,&_obj0,&_arg1,&_argo2)) @@ -10492,6 +10492,9 @@ SWIGEXPORT(void) initmisc2c() { PyDict_SetItemString(d,"wxLOG_Progress", PyInt_FromLong((long) wxLOG_Progress)); PyDict_SetItemString(d,"wxLOG_User", PyInt_FromLong((long) wxLOG_User)); PyDict_SetItemString(d,"wxEVT_END_PROCESS", PyInt_FromLong((long) wxEVT_END_PROCESS)); + PyDict_SetItemString(d,"wxEXEC_ASYNC", PyInt_FromLong((long) wxEXEC_ASYNC)); + PyDict_SetItemString(d,"wxEXEC_SYNC", PyInt_FromLong((long) wxEXEC_SYNC)); + PyDict_SetItemString(d,"wxEXEC_NOHIDE", PyInt_FromLong((long) wxEXEC_NOHIDE)); PyDict_SetItemString(d,"wxMAILCAP_STANDARD", PyInt_FromLong((long) wxMAILCAP_STANDARD)); PyDict_SetItemString(d,"wxMAILCAP_NETSCAPE", PyInt_FromLong((long) wxMAILCAP_NETSCAPE)); PyDict_SetItemString(d,"wxMAILCAP_KDE", PyInt_FromLong((long) wxMAILCAP_KDE)); diff --git a/wxPython/src/gtk/misc2.py b/wxPython/src/gtk/misc2.py index 7e1214c397..3b156e77a7 100644 --- a/wxPython/src/gtk/misc2.py +++ b/wxPython/src/gtk/misc2.py @@ -1300,6 +1300,9 @@ wxLOG_Trace = misc2c.wxLOG_Trace wxLOG_Progress = misc2c.wxLOG_Progress wxLOG_User = misc2c.wxLOG_User wxEVT_END_PROCESS = misc2c.wxEVT_END_PROCESS +wxEXEC_ASYNC = misc2c.wxEXEC_ASYNC +wxEXEC_SYNC = misc2c.wxEXEC_SYNC +wxEXEC_NOHIDE = misc2c.wxEXEC_NOHIDE wxMAILCAP_STANDARD = misc2c.wxMAILCAP_STANDARD wxMAILCAP_NETSCAPE = misc2c.wxMAILCAP_NETSCAPE wxMAILCAP_KDE = misc2c.wxMAILCAP_KDE diff --git a/wxPython/src/gtk/stattool.cpp b/wxPython/src/gtk/stattool.cpp index 5ebf0a1ab1..f0802771fd 100644 --- a/wxPython/src/gtk/stattool.cpp +++ b/wxPython/src/gtk/stattool.cpp @@ -784,6 +784,34 @@ static PyObject *_wrap_wxToolBarToolBase_GetStyle(PyObject *self, PyObject *args return _resultobj; } +#define wxToolBarToolBase_GetKind(_swigobj) (_swigobj->GetKind()) +static PyObject *_wrap_wxToolBarToolBase_GetKind(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxItemKind _result; + wxToolBarToolBase * _arg0; + PyObject * _argo0 = 0; + char *_kwnames[] = { "self", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O:wxToolBarToolBase_GetKind",_kwnames,&_argo0)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarToolBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarToolBase_GetKind. Expected _wxToolBarToolBase_p."); + return NULL; + } + } +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxItemKind )wxToolBarToolBase_GetKind(_arg0); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +} _resultobj = Py_BuildValue("i",_result); + return _resultobj; +} + #define wxToolBarToolBase_IsEnabled(_swigobj) (_swigobj->IsEnabled()) static PyObject *_wrap_wxToolBarToolBase_IsEnabled(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1533,34 +1561,36 @@ static void *SwigwxToolBarBaseTowxObject(void *ptr) { return (void *) dest; } -static wxToolBarToolBase * wxToolBarBase_AddTool(wxToolBarBase *self,int id,const wxBitmap & bitmap,const wxBitmap & pushedBitmap,int isToggle,PyObject * clientData,const wxString & shortHelpString,const wxString & longHelpString) { +static wxToolBarToolBase * wxToolBarBase_AddTool(wxToolBarBase *self,int id,const wxString & label,const wxBitmap & bitmap,const wxBitmap & bmpDisabled,wxItemKind kind,const wxString & shortHelp,const wxString & longHelp,PyObject * clientData) { wxPyUserData* udata = NULL; if (clientData) udata = new wxPyUserData(clientData); - return self->AddTool(id, bitmap, pushedBitmap, (bool)isToggle, - udata, shortHelpString, longHelpString); + return self->AddTool(id, label, bitmap, bmpDisabled, kind, + shortHelp, longHelp, udata); } static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxToolBarToolBase * _result; wxToolBarBase * _arg0; int _arg1; - wxBitmap * _arg2; - wxBitmap * _arg3 = (wxBitmap *) &wxNullBitmap; - int _arg4 = (int ) FALSE; - PyObject * _arg5 = (PyObject *) NULL; + wxString * _arg2; + wxBitmap * _arg3; + wxBitmap * _arg4; + wxItemKind _arg5 = (wxItemKind ) wxITEM_NORMAL; wxString * _arg6 = (wxString *) &wxPyEmptyString; wxString * _arg7 = (wxString *) &wxPyEmptyString; + PyObject * _arg8 = (PyObject *) NULL; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; + PyObject * _obj2 = 0; PyObject * _argo3 = 0; - PyObject * _obj5 = 0; + PyObject * _argo4 = 0; PyObject * _obj6 = 0; PyObject * _obj7 = 0; - char *_kwnames[] = { "self","id","bitmap","pushedBitmap","isToggle","clientData","shortHelpString","longHelpString", NULL }; + PyObject * _obj8 = 0; + char *_kwnames[] = { "self","id","label","bitmap","bmpDisabled","kind","shortHelp","longHelp","clientData", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OiOOO:wxToolBarBase_AddTool",_kwnames,&_argo0,&_arg1,&_argo2,&_argo3,&_arg4,&_obj5,&_obj6,&_obj7)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOOO|iOOO:wxToolBarBase_AddTool",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_arg5,&_obj6,&_obj7,&_obj8)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1569,13 +1599,11 @@ static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args, PyO return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBarBase_AddTool. Expected _wxBitmap_p."); +{ + _arg2 = wxString_in_helper(_obj2); + if (_arg2 == NULL) return NULL; - } - } +} if (_argo3) { if (_argo3 == Py_None) { _arg3 = NULL; } else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxBitmap_p")) { @@ -1583,10 +1611,13 @@ static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args, PyO return NULL; } } - if (_obj5) -{ - _arg5 = _obj5; -} + if (_argo4) { + if (_argo4 == Py_None) { _arg4 = NULL; } + else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxToolBarBase_AddTool. Expected _wxBitmap_p."); + return NULL; + } + } if (_obj6) { _arg6 = wxString_in_helper(_obj6); @@ -1598,14 +1629,22 @@ static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args, PyO _arg7 = wxString_in_helper(_obj7); if (_arg7 == NULL) return NULL; +} + if (_obj8) +{ + _arg8 = _obj8; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxToolBarToolBase *)wxToolBarBase_AddTool(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5,*_arg6,*_arg7); + _result = (wxToolBarToolBase *)wxToolBarBase_AddTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5,*_arg6,*_arg7,_arg8); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; }{ _resultobj = wxPyMake_wxObject(_result); } +{ + if (_obj2) + delete _arg2; +} { if (_obj6) delete _arg6; @@ -1617,27 +1656,29 @@ static PyObject *_wrap_wxToolBarBase_AddTool(PyObject *self, PyObject *args, PyO return _resultobj; } -static wxToolBarToolBase * wxToolBarBase_AddSimpleTool(wxToolBarBase *self,int id,const wxBitmap & bitmap,const wxString & shortHelpString,const wxString & longHelpString,int isToggle) { - return self->AddTool(id, bitmap, wxNullBitmap, isToggle, NULL, - shortHelpString, longHelpString); +static wxToolBarToolBase * wxToolBarBase_AddSimpleTool(wxToolBarBase *self,int id,const wxString & label,const wxBitmap & bitmap,const wxString & shortHelp,const wxString & longHelp,wxItemKind kind) { + return self->AddTool(id, label, bitmap, wxNullBitmap, kind, + shortHelp, longHelp, NULL); } static PyObject *_wrap_wxToolBarBase_AddSimpleTool(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxToolBarToolBase * _result; wxToolBarBase * _arg0; int _arg1; - wxBitmap * _arg2; - wxString * _arg3 = (wxString *) &wxPyEmptyString; + wxString * _arg2; + wxBitmap * _arg3; wxString * _arg4 = (wxString *) &wxPyEmptyString; - int _arg5 = (int ) FALSE; + wxString * _arg5 = (wxString *) &wxPyEmptyString; + wxItemKind _arg6 = (wxItemKind ) wxITEM_NORMAL; PyObject * _argo0 = 0; - PyObject * _argo2 = 0; - PyObject * _obj3 = 0; + PyObject * _obj2 = 0; + PyObject * _argo3 = 0; PyObject * _obj4 = 0; - char *_kwnames[] = { "self","id","bitmap","shortHelpString","longHelpString","isToggle", NULL }; + PyObject * _obj5 = 0; + char *_kwnames[] = { "self","id","label","bitmap","shortHelp","longHelp","kind", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiO|OOi:wxToolBarBase_AddSimpleTool",_kwnames,&_argo0,&_arg1,&_argo2,&_obj3,&_obj4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO|OOi:wxToolBarBase_AddSimpleTool",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_obj4,&_obj5,&_arg6)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1646,99 +1687,299 @@ static PyObject *_wrap_wxToolBarBase_AddSimpleTool(PyObject *self, PyObject *arg return NULL; } } - if (_argo2) { - if (_argo2 == Py_None) { _arg2 = NULL; } - else if (SWIG_GetPtrObj(_argo2,(void **) &_arg2,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 3 of wxToolBarBase_AddSimpleTool. Expected _wxBitmap_p."); - return NULL; - } - } - if (_obj3) { - _arg3 = wxString_in_helper(_obj3); - if (_arg3 == NULL) + _arg2 = wxString_in_helper(_obj2); + if (_arg2 == NULL) return NULL; } + if (_argo3) { + if (_argo3 == Py_None) { _arg3 = NULL; } + else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBarBase_AddSimpleTool. Expected _wxBitmap_p."); + return NULL; + } + } if (_obj4) { _arg4 = wxString_in_helper(_obj4); if (_arg4 == NULL) return NULL; +} + if (_obj5) +{ + _arg5 = wxString_in_helper(_obj5); + if (_arg5 == NULL) + return NULL; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxToolBarToolBase *)wxToolBarBase_AddSimpleTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4,_arg5); + _result = (wxToolBarToolBase *)wxToolBarBase_AddSimpleTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4,*_arg5,_arg6); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; }{ _resultobj = wxPyMake_wxObject(_result); } { - if (_obj3) - delete _arg3; + if (_obj2) + delete _arg2; } { if (_obj4) delete _arg4; +} +{ + if (_obj5) + delete _arg5; } return _resultobj; } -static wxToolBarToolBase * wxToolBarBase_InsertTool(wxToolBarBase *self,size_t pos,int id,const wxBitmap & bitmap,const wxBitmap & pushedBitmap,int isToggle,PyObject * clientData,const wxString & shortHelpString,const wxString & longHelpString) { +static wxToolBarToolBase * wxToolBarBase_AddCheckTool(wxToolBarBase *self,int id,const wxString & label,const wxBitmap & bitmap,const wxBitmap & bmpDisabled,const wxString & shortHelp,const wxString & longHelp,PyObject * clientData) { wxPyUserData* udata = NULL; if (clientData) udata = new wxPyUserData(clientData); - return self->InsertTool(pos, id, bitmap, pushedBitmap, (bool)isToggle, - udata, shortHelpString, longHelpString); + return self->AddCheckTool(id, label, bitmap, bmpDisabled, + shortHelp, longHelp, udata); } -static PyObject *_wrap_wxToolBarBase_InsertTool(PyObject *self, PyObject *args, PyObject *kwargs) { +static PyObject *_wrap_wxToolBarBase_AddCheckTool(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxToolBarToolBase * _result; wxToolBarBase * _arg0; - size_t _arg1; - int _arg2; + int _arg1; + wxString * _arg2; wxBitmap * _arg3; wxBitmap * _arg4 = (wxBitmap *) &wxNullBitmap; - int _arg5 = (int ) FALSE; - PyObject * _arg6 = (PyObject *) NULL; - wxString * _arg7 = (wxString *) &wxPyEmptyString; - wxString * _arg8 = (wxString *) &wxPyEmptyString; + wxString * _arg5 = (wxString *) &wxEmptyString; + wxString * _arg6 = (wxString *) &wxEmptyString; + PyObject * _arg7 = (PyObject *) NULL; PyObject * _argo0 = 0; + PyObject * _obj2 = 0; PyObject * _argo3 = 0; PyObject * _argo4 = 0; + PyObject * _obj5 = 0; PyObject * _obj6 = 0; PyObject * _obj7 = 0; - PyObject * _obj8 = 0; - char *_kwnames[] = { "self","pos","id","bitmap","pushedBitmap","isToggle","clientData","shortHelpString","longHelpString", NULL }; + char *_kwnames[] = { "self","id","label","bitmap","bmpDisabled","shortHelp","longHelp","clientData", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiO|OiOOO:wxToolBarBase_InsertTool",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_argo4,&_arg5,&_obj6,&_obj7,&_obj8)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO|OOOO:wxToolBarBase_AddCheckTool",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_obj5,&_obj6,&_obj7)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_InsertTool. Expected _wxToolBarBase_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_AddCheckTool. Expected _wxToolBarBase_p."); return NULL; } } +{ + _arg2 = wxString_in_helper(_obj2); + if (_arg2 == NULL) + return NULL; +} if (_argo3) { if (_argo3 == Py_None) { _arg3 = NULL; } else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBarBase_InsertTool. Expected _wxBitmap_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBarBase_AddCheckTool. Expected _wxBitmap_p."); return NULL; } } if (_argo4) { if (_argo4 == Py_None) { _arg4 = NULL; } else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxToolBarBase_InsertTool. Expected _wxBitmap_p."); + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxToolBarBase_AddCheckTool. Expected _wxBitmap_p."); return NULL; } } + if (_obj5) +{ + _arg5 = wxString_in_helper(_obj5); + if (_arg5 == NULL) + return NULL; +} if (_obj6) { - _arg6 = _obj6; + _arg6 = wxString_in_helper(_obj6); + if (_arg6 == NULL) + return NULL; } if (_obj7) +{ + _arg7 = _obj7; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxToolBarToolBase *)wxToolBarBase_AddCheckTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4,*_arg5,*_arg6,_arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } +{ + if (_obj2) + delete _arg2; +} +{ + if (_obj5) + delete _arg5; +} +{ + if (_obj6) + delete _arg6; +} + return _resultobj; +} + +static wxToolBarToolBase * wxToolBarBase_AddRadioTool(wxToolBarBase *self,int id,const wxString & label,const wxBitmap & bitmap,const wxBitmap & bmpDisabled,const wxString & shortHelp,const wxString & longHelp,PyObject * clientData) { + wxPyUserData* udata = NULL; + if (clientData) + udata = new wxPyUserData(clientData); + return self->AddRadioTool(id, label, bitmap, bmpDisabled, + shortHelp, longHelp, udata); + } +static PyObject *_wrap_wxToolBarBase_AddRadioTool(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxToolBarToolBase * _result; + wxToolBarBase * _arg0; + int _arg1; + wxString * _arg2; + wxBitmap * _arg3; + wxBitmap * _arg4 = (wxBitmap *) &wxNullBitmap; + wxString * _arg5 = (wxString *) &wxEmptyString; + wxString * _arg6 = (wxString *) &wxEmptyString; + PyObject * _arg7 = (PyObject *) NULL; + PyObject * _argo0 = 0; + PyObject * _obj2 = 0; + PyObject * _argo3 = 0; + PyObject * _argo4 = 0; + PyObject * _obj5 = 0; + PyObject * _obj6 = 0; + PyObject * _obj7 = 0; + char *_kwnames[] = { "self","id","label","bitmap","bmpDisabled","shortHelp","longHelp","clientData", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiOO|OOOO:wxToolBarBase_AddRadioTool",_kwnames,&_argo0,&_arg1,&_obj2,&_argo3,&_argo4,&_obj5,&_obj6,&_obj7)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_AddRadioTool. Expected _wxToolBarBase_p."); + return NULL; + } + } +{ + _arg2 = wxString_in_helper(_obj2); + if (_arg2 == NULL) + return NULL; +} + if (_argo3) { + if (_argo3 == Py_None) { _arg3 = NULL; } + else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBarBase_AddRadioTool. Expected _wxBitmap_p."); + return NULL; + } + } + if (_argo4) { + if (_argo4 == Py_None) { _arg4 = NULL; } + else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxToolBarBase_AddRadioTool. Expected _wxBitmap_p."); + return NULL; + } + } + if (_obj5) +{ + _arg5 = wxString_in_helper(_obj5); + if (_arg5 == NULL) + return NULL; +} + if (_obj6) +{ + _arg6 = wxString_in_helper(_obj6); + if (_arg6 == NULL) + return NULL; +} + if (_obj7) +{ + _arg7 = _obj7; +} +{ + PyThreadState* __tstate = wxPyBeginAllowThreads(); + _result = (wxToolBarToolBase *)wxToolBarBase_AddRadioTool(_arg0,_arg1,*_arg2,*_arg3,*_arg4,*_arg5,*_arg6,_arg7); + + wxPyEndAllowThreads(__tstate); + if (PyErr_Occurred()) return NULL; +}{ _resultobj = wxPyMake_wxObject(_result); } +{ + if (_obj2) + delete _arg2; +} +{ + if (_obj5) + delete _arg5; +} +{ + if (_obj6) + delete _arg6; +} + return _resultobj; +} + +static wxToolBarToolBase * wxToolBarBase_InsertTool(wxToolBarBase *self,size_t pos,int id,const wxString & label,const wxBitmap & bitmap,const wxBitmap & bmpDisabled,wxItemKind kind,const wxString & shortHelp,const wxString & longHelp,PyObject * clientData) { + wxPyUserData* udata = NULL; + if (clientData) + udata = new wxPyUserData(clientData); + return self->InsertTool(pos, id, label, bitmap, bmpDisabled, kind, + shortHelp, longHelp, udata); + } +static PyObject *_wrap_wxToolBarBase_InsertTool(PyObject *self, PyObject *args, PyObject *kwargs) { + PyObject * _resultobj; + wxToolBarToolBase * _result; + wxToolBarBase * _arg0; + size_t _arg1; + int _arg2; + wxString * _arg3; + wxBitmap * _arg4; + wxBitmap * _arg5 = (wxBitmap *) &wxNullBitmap; + wxItemKind _arg6 = (wxItemKind ) wxITEM_NORMAL; + wxString * _arg7 = (wxString *) &wxEmptyString; + wxString * _arg8 = (wxString *) &wxEmptyString; + PyObject * _arg9 = (PyObject *) NULL; + PyObject * _argo0 = 0; + PyObject * _obj3 = 0; + PyObject * _argo4 = 0; + PyObject * _argo5 = 0; + PyObject * _obj7 = 0; + PyObject * _obj8 = 0; + PyObject * _obj9 = 0; + char *_kwnames[] = { "self","pos","id","label","bitmap","bmpDisabled","kind","shortHelp","longHelp","clientData", NULL }; + + self = self; + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiOO|OiOOO:wxToolBarBase_InsertTool",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3,&_argo4,&_argo5,&_arg6,&_obj7,&_obj8,&_obj9)) + return NULL; + if (_argo0) { + if (_argo0 == Py_None) { _arg0 = NULL; } + else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxToolBarBase_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxToolBarBase_InsertTool. Expected _wxToolBarBase_p."); + return NULL; + } + } +{ + _arg3 = wxString_in_helper(_obj3); + if (_arg3 == NULL) + return NULL; +} + if (_argo4) { + if (_argo4 == Py_None) { _arg4 = NULL; } + else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxToolBarBase_InsertTool. Expected _wxBitmap_p."); + return NULL; + } + } + if (_argo5) { + if (_argo5 == Py_None) { _arg5 = NULL; } + else if (SWIG_GetPtrObj(_argo5,(void **) &_arg5,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 6 of wxToolBarBase_InsertTool. Expected _wxBitmap_p."); + return NULL; + } + } + if (_obj7) { _arg7 = wxString_in_helper(_obj7); if (_arg7 == NULL) @@ -1749,14 +1990,22 @@ static PyObject *_wrap_wxToolBarBase_InsertTool(PyObject *self, PyObject *args, _arg8 = wxString_in_helper(_obj8); if (_arg8 == NULL) return NULL; +} + if (_obj9) +{ + _arg9 = _obj9; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxToolBarToolBase *)wxToolBarBase_InsertTool(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,_arg6,*_arg7,*_arg8); + _result = (wxToolBarToolBase *)wxToolBarBase_InsertTool(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6,*_arg7,*_arg8,_arg9); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; }{ _resultobj = wxPyMake_wxObject(_result); } +{ + if (_obj3) + delete _arg3; +} { if (_obj7) delete _arg7; @@ -1768,9 +2017,9 @@ static PyObject *_wrap_wxToolBarBase_InsertTool(PyObject *self, PyObject *args, return _resultobj; } -static wxToolBarToolBase * wxToolBarBase_InsertSimpleTool(wxToolBarBase *self,size_t pos,int id,const wxBitmap & bitmap,const wxString & shortHelpString,const wxString & longHelpString,int isToggle) { - return self->InsertTool(pos, id, bitmap, wxNullBitmap, isToggle, NULL, - shortHelpString, longHelpString); +static wxToolBarToolBase * wxToolBarBase_InsertSimpleTool(wxToolBarBase *self,size_t pos,int id,const wxString & label,const wxBitmap & bitmap,wxItemKind kind,const wxString & shortHelp,const wxString & longHelp) { + return self->InsertTool(pos, id, label, bitmap, wxNullBitmap, kind, + shortHelp, longHelp); } static PyObject *_wrap_wxToolBarBase_InsertSimpleTool(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; @@ -1778,18 +2027,20 @@ static PyObject *_wrap_wxToolBarBase_InsertSimpleTool(PyObject *self, PyObject * wxToolBarBase * _arg0; size_t _arg1; int _arg2; - wxBitmap * _arg3; - wxString * _arg4 = (wxString *) &wxPyEmptyString; - wxString * _arg5 = (wxString *) &wxPyEmptyString; - int _arg6 = (int ) FALSE; + wxString * _arg3; + wxBitmap * _arg4; + wxItemKind _arg5 = (wxItemKind ) wxITEM_NORMAL; + wxString * _arg6 = (wxString *) &wxEmptyString; + wxString * _arg7 = (wxString *) &wxEmptyString; PyObject * _argo0 = 0; - PyObject * _argo3 = 0; - PyObject * _obj4 = 0; - PyObject * _obj5 = 0; - char *_kwnames[] = { "self","pos","id","bitmap","shortHelpString","longHelpString","isToggle", NULL }; + PyObject * _obj3 = 0; + PyObject * _argo4 = 0; + PyObject * _obj6 = 0; + PyObject * _obj7 = 0; + char *_kwnames[] = { "self","pos","id","label","bitmap","kind","shortHelp","longHelp", NULL }; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiO|OOi:wxToolBarBase_InsertSimpleTool",_kwnames,&_argo0,&_arg1,&_arg2,&_argo3,&_obj4,&_obj5,&_arg6)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"OiiOO|iOO:wxToolBarBase_InsertSimpleTool",_kwnames,&_argo0,&_arg1,&_arg2,&_obj3,&_argo4,&_arg5,&_obj6,&_obj7)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -1798,39 +2049,48 @@ static PyObject *_wrap_wxToolBarBase_InsertSimpleTool(PyObject *self, PyObject * return NULL; } } - if (_argo3) { - if (_argo3 == Py_None) { _arg3 = NULL; } - else if (SWIG_GetPtrObj(_argo3,(void **) &_arg3,"_wxBitmap_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 4 of wxToolBarBase_InsertSimpleTool. Expected _wxBitmap_p."); +{ + _arg3 = wxString_in_helper(_obj3); + if (_arg3 == NULL) + return NULL; +} + if (_argo4) { + if (_argo4 == Py_None) { _arg4 = NULL; } + else if (SWIG_GetPtrObj(_argo4,(void **) &_arg4,"_wxBitmap_p")) { + PyErr_SetString(PyExc_TypeError,"Type error in argument 5 of wxToolBarBase_InsertSimpleTool. Expected _wxBitmap_p."); return NULL; } } - if (_obj4) + if (_obj6) { - _arg4 = wxString_in_helper(_obj4); - if (_arg4 == NULL) + _arg6 = wxString_in_helper(_obj6); + if (_arg6 == NULL) return NULL; } - if (_obj5) + if (_obj7) { - _arg5 = wxString_in_helper(_obj5); - if (_arg5 == NULL) + _arg7 = wxString_in_helper(_obj7); + if (_arg7 == NULL) return NULL; } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = (wxToolBarToolBase *)wxToolBarBase_InsertSimpleTool(_arg0,_arg1,_arg2,*_arg3,*_arg4,*_arg5,_arg6); + _result = (wxToolBarToolBase *)wxToolBarBase_InsertSimpleTool(_arg0,_arg1,_arg2,*_arg3,*_arg4,_arg5,*_arg6,*_arg7); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) return NULL; }{ _resultobj = wxPyMake_wxObject(_result); } { - if (_obj4) - delete _arg4; + if (_obj3) + delete _arg3; } { - if (_obj5) - delete _arg5; + if (_obj6) + delete _arg6; +} +{ + if (_obj7) + delete _arg7; } return _resultobj; } @@ -3517,6 +3777,8 @@ static PyMethodDef stattoolcMethods[] = { { "wxToolBarBase_AddControl", (PyCFunction) _wrap_wxToolBarBase_AddControl, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarBase_InsertSimpleTool", (PyCFunction) _wrap_wxToolBarBase_InsertSimpleTool, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarBase_InsertTool", (PyCFunction) _wrap_wxToolBarBase_InsertTool, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_AddRadioTool", (PyCFunction) _wrap_wxToolBarBase_AddRadioTool, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarBase_AddCheckTool", (PyCFunction) _wrap_wxToolBarBase_AddCheckTool, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarBase_AddSimpleTool", (PyCFunction) _wrap_wxToolBarBase_AddSimpleTool, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarBase_AddTool", (PyCFunction) _wrap_wxToolBarBase_AddTool, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarToolBase_SetClientData", (PyCFunction) _wrap_wxToolBarToolBase_SetClientData, METH_VARARGS | METH_KEYWORDS }, @@ -3540,6 +3802,7 @@ static PyMethodDef stattoolcMethods[] = { { "wxToolBarToolBase_CanBeToggled", (PyCFunction) _wrap_wxToolBarToolBase_CanBeToggled, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarToolBase_IsToggled", (PyCFunction) _wrap_wxToolBarToolBase_IsToggled, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarToolBase_IsEnabled", (PyCFunction) _wrap_wxToolBarToolBase_IsEnabled, METH_VARARGS | METH_KEYWORDS }, + { "wxToolBarToolBase_GetKind", (PyCFunction) _wrap_wxToolBarToolBase_GetKind, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarToolBase_GetStyle", (PyCFunction) _wrap_wxToolBarToolBase_GetStyle, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarToolBase_IsSeparator", (PyCFunction) _wrap_wxToolBarToolBase_IsSeparator, METH_VARARGS | METH_KEYWORDS }, { "wxToolBarToolBase_IsControl", (PyCFunction) _wrap_wxToolBarToolBase_IsControl, METH_VARARGS | METH_KEYWORDS }, diff --git a/wxPython/src/gtk/stattool.py b/wxPython/src/gtk/stattool.py index 4e8be2301b..2dc9618b78 100644 --- a/wxPython/src/gtk/stattool.py +++ b/wxPython/src/gtk/stattool.py @@ -93,6 +93,9 @@ class wxToolBarToolBasePtr(wxObjectPtr): def GetStyle(self, *_args, **_kwargs): val = apply(stattoolc.wxToolBarToolBase_GetStyle,(self,) + _args, _kwargs) return val + def GetKind(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarToolBase_GetKind,(self,) + _args, _kwargs) + return val def IsEnabled(self, *_args, **_kwargs): val = apply(stattoolc.wxToolBarToolBase_IsEnabled,(self,) + _args, _kwargs) return val @@ -184,6 +187,12 @@ class wxToolBarBasePtr(wxControlPtr): def AddSimpleTool(self, *_args, **_kwargs): val = apply(stattoolc.wxToolBarBase_AddSimpleTool,(self,) + _args, _kwargs) return val + def AddCheckTool(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_AddCheckTool,(self,) + _args, _kwargs) + return val + def AddRadioTool(self, *_args, **_kwargs): + val = apply(stattoolc.wxToolBarBase_AddRadioTool,(self,) + _args, _kwargs) + return val def InsertTool(self, *_args, **_kwargs): val = apply(stattoolc.wxToolBarBase_InsertTool,(self,) + _args, _kwargs) return val diff --git a/wxPython/src/gtk/wx.cpp b/wxPython/src/gtk/wx.cpp index 71eae9ee1b..1721f87e28 100644 --- a/wxPython/src/gtk/wx.cpp +++ b/wxPython/src/gtk/wx.cpp @@ -1650,39 +1650,7 @@ static PyObject *_wrap_wxPyApp_SetUseBestVisual(PyObject *self, PyObject *args, return _resultobj; } -#define wxPyApp_GetStdIcon(_swigobj,_swigarg0) (_swigobj->GetStdIcon(_swigarg0)) -static PyObject *_wrap_wxPyApp_GetStdIcon(PyObject *self, PyObject *args, PyObject *kwargs) { - PyObject * _resultobj; - wxIcon * _result; - wxPyApp * _arg0; - int _arg1; - PyObject * _argo0 = 0; - char *_kwnames[] = { "self","which", NULL }; - char _ptemp[128]; - - self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi:wxPyApp_GetStdIcon",_kwnames,&_argo0,&_arg1)) - return NULL; - if (_argo0) { - if (_argo0 == Py_None) { _arg0 = NULL; } - else if (SWIG_GetPtrObj(_argo0,(void **) &_arg0,"_wxPyApp_p")) { - PyErr_SetString(PyExc_TypeError,"Type error in argument 1 of wxPyApp_GetStdIcon. Expected _wxPyApp_p."); - return NULL; - } - } -{ - PyThreadState* __tstate = wxPyBeginAllowThreads(); - _result = new wxIcon (wxPyApp_GetStdIcon(_arg0,_arg1)); - - wxPyEndAllowThreads(__tstate); - if (PyErr_Occurred()) return NULL; -} SWIG_MakePtr(_ptemp, (void *) _result,"_wxIcon_p"); - _resultobj = Py_BuildValue("s",_ptemp); - return _resultobj; -} - static PyMethodDef wxcMethods[] = { - { "wxPyApp_GetStdIcon", (PyCFunction) _wrap_wxPyApp_GetStdIcon, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_SetUseBestVisual", (PyCFunction) _wrap_wxPyApp_SetUseBestVisual, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_SetVendorName", (PyCFunction) _wrap_wxPyApp_SetVendorName, METH_VARARGS | METH_KEYWORDS }, { "wxPyApp_SetTopWindow", (PyCFunction) _wrap_wxPyApp_SetTopWindow, METH_VARARGS | METH_KEYWORDS }, @@ -1894,11 +1862,13 @@ SWIGEXPORT(void) initwxc() { PyDict_SetItemString(d,"wxCLIP_SIBLINGS", PyInt_FromLong((long) wxCLIP_SIBLINGS)); PyDict_SetItemString(d,"wxRETAINED", PyInt_FromLong((long) wxRETAINED)); PyDict_SetItemString(d,"wxBACKINGSTORE", PyInt_FromLong((long) wxBACKINGSTORE)); - PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS)); PyDict_SetItemString(d,"wxTB_HORIZONTAL", PyInt_FromLong((long) wxTB_HORIZONTAL)); PyDict_SetItemString(d,"wxTB_VERTICAL", PyInt_FromLong((long) wxTB_VERTICAL)); + PyDict_SetItemString(d,"wxTB_3DBUTTONS", PyInt_FromLong((long) wxTB_3DBUTTONS)); PyDict_SetItemString(d,"wxTB_FLAT", PyInt_FromLong((long) wxTB_FLAT)); PyDict_SetItemString(d,"wxTB_DOCKABLE", PyInt_FromLong((long) wxTB_DOCKABLE)); + PyDict_SetItemString(d,"wxTB_NOICONS", PyInt_FromLong((long) wxTB_NOICONS)); + PyDict_SetItemString(d,"wxTB_TEXT", PyInt_FromLong((long) wxTB_TEXT)); PyDict_SetItemString(d,"wxCOLOURED", PyInt_FromLong((long) wxCOLOURED)); PyDict_SetItemString(d,"wxFIXED_LENGTH", PyInt_FromLong((long) wxFIXED_LENGTH)); PyDict_SetItemString(d,"wxALIGN_LEFT", PyInt_FromLong((long) wxALIGN_LEFT)); diff --git a/wxPython/src/gtk/wx.py b/wxPython/src/gtk/wx.py index 6c9797eefe..c3727e1949 100644 --- a/wxPython/src/gtk/wx.py +++ b/wxPython/src/gtk/wx.py @@ -107,10 +107,6 @@ class wxPyAppPtr(wxEvtHandlerPtr): def SetUseBestVisual(self, *_args, **_kwargs): val = apply(wxc.wxPyApp_SetUseBestVisual,(self,) + _args, _kwargs) return val - def GetStdIcon(self, *_args, **_kwargs): - val = apply(wxc.wxPyApp_GetStdIcon,(self,) + _args, _kwargs) - if val: val = wxIconPtr(val) ; val.thisown = 1 - return val def __repr__(self): return "" % (self.this,) class wxPyApp(wxPyAppPtr): @@ -210,11 +206,13 @@ wxCLIP_CHILDREN = wxc.wxCLIP_CHILDREN wxCLIP_SIBLINGS = wxc.wxCLIP_SIBLINGS wxRETAINED = wxc.wxRETAINED wxBACKINGSTORE = wxc.wxBACKINGSTORE -wxTB_3DBUTTONS = wxc.wxTB_3DBUTTONS wxTB_HORIZONTAL = wxc.wxTB_HORIZONTAL wxTB_VERTICAL = wxc.wxTB_VERTICAL +wxTB_3DBUTTONS = wxc.wxTB_3DBUTTONS wxTB_FLAT = wxc.wxTB_FLAT wxTB_DOCKABLE = wxc.wxTB_DOCKABLE +wxTB_NOICONS = wxc.wxTB_NOICONS +wxTB_TEXT = wxc.wxTB_TEXT wxCOLOURED = wxc.wxCOLOURED wxFIXED_LENGTH = wxc.wxFIXED_LENGTH wxALIGN_LEFT = wxc.wxALIGN_LEFT