From 99f7d3407f2b87e11716393efcfe5260280567fa Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Tue, 16 Oct 2001 19:02:44 +0000 Subject: [PATCH] update for interface changes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12031 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- wxPython/src/msw/stattool.cpp | 32 +++++++------------------------- wxPython/src/stattool.i | 4 +--- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/wxPython/src/msw/stattool.cpp b/wxPython/src/msw/stattool.cpp index fef9713035..a28ddd9d2c 100644 --- a/wxPython/src/msw/stattool.cpp +++ b/wxPython/src/msw/stattool.cpp @@ -120,26 +120,20 @@ static void *SwigwxStatusBarTowxObject(void *ptr) { return (void *) dest; } -#define new_wxStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5) (new wxStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3,_swigarg4,_swigarg5)) +#define new_wxStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3) (new wxStatusBar(_swigarg0,_swigarg1,_swigarg2,_swigarg3)) static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args, PyObject *kwargs) { PyObject * _resultobj; wxStatusBar * _result; wxWindow * _arg0; - wxWindowID _arg1; - wxPoint * _arg2 = (wxPoint *) &wxDefaultPosition; - wxSize * _arg3 = (wxSize *) &wxDefaultSize; - long _arg4 = (long ) wxST_SIZEGRIP; - char * _arg5 = (char *) "statusBar"; + wxWindowID _arg1 = (wxWindowID ) -1; + long _arg2 = (long ) wxST_SIZEGRIP; + char * _arg3 = (char *) "statusBar"; PyObject * _argo0 = 0; - wxPoint temp; - PyObject * _obj2 = 0; - wxSize temp0; - PyObject * _obj3 = 0; - char *_kwnames[] = { "parent","id","pos","size","style","name", NULL }; + char *_kwnames[] = { "parent","id","style","name", NULL }; char _ptemp[128]; self = self; - if(!PyArg_ParseTupleAndKeywords(args,kwargs,"Oi|OOls:new_wxStatusBar",_kwnames,&_argo0,&_arg1,&_obj2,&_obj3,&_arg4,&_arg5)) + if(!PyArg_ParseTupleAndKeywords(args,kwargs,"O|ils:new_wxStatusBar",_kwnames,&_argo0,&_arg1,&_arg2,&_arg3)) return NULL; if (_argo0) { if (_argo0 == Py_None) { _arg0 = NULL; } @@ -148,21 +142,9 @@ static PyObject *_wrap_new_wxStatusBar(PyObject *self, PyObject *args, PyObject return NULL; } } - if (_obj2) -{ - _arg2 = &temp; - if (! wxPoint_helper(_obj2, &_arg2)) - return NULL; -} - if (_obj3) -{ - _arg3 = &temp0; - if (! wxSize_helper(_obj3, &_arg3)) - return NULL; -} { wxPy_BEGIN_ALLOW_THREADS; - _result = (wxStatusBar *)new_wxStatusBar(_arg0,_arg1,*_arg2,*_arg3,_arg4,_arg5); + _result = (wxStatusBar *)new_wxStatusBar(_arg0,_arg1,_arg2,_arg3); wxPy_END_ALLOW_THREADS; if (PyErr_Occurred()) return NULL; diff --git a/wxPython/src/stattool.i b/wxPython/src/stattool.i index 30ace47a47..1b294d3dba 100644 --- a/wxPython/src/stattool.i +++ b/wxPython/src/stattool.i @@ -41,9 +41,7 @@ class wxStatusBar : public wxWindow { public: - wxStatusBar(wxWindow* parent, wxWindowID id, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, + wxStatusBar(wxWindow* parent, wxWindowID id = -1, long style = wxST_SIZEGRIP, char* name = "statusBar"); %name(wxPreStatusBar)wxStatusBar(); -- 2.45.2