diff --git a/wxPython/src/_sizers.i b/wxPython/src/_sizers.i index 9b76f8db87..d72414702a 100644 --- a/wxPython/src/_sizers.i +++ b/wxPython/src/_sizers.i @@ -903,18 +903,18 @@ was found and detached.", ""); DocAStr(GetItem, - "GetItem(self, item) -> wx.SizerItem", + "GetItem(self, item, recursive=False) -> wx.SizerItem", "Returns the `wx.SizerItem` which holds the *item* given. The *item* parameter can be either a window, a sizer, or the zero-based index of the item to be found.", ""); - wxSizerItem* GetItem(PyObject* item) { + wxSizerItem* GetItem(PyObject* item, bool recursive=false) { wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPyEndBlockThreads(blocked); if ( info.window ) - return self->GetItem(info.window); + return self->GetItem(info.window, recursive); else if ( info.sizer ) - return self->GetItem(info.sizer); + return self->GetItem(info.sizer, recursive); else if ( info.gotPos ) return self->GetItem(info.pos); else diff --git a/wxPython/src/gtk/_core.py b/wxPython/src/gtk/_core.py index bc08380262..382f2c24a9 100644 --- a/wxPython/src/gtk/_core.py +++ b/wxPython/src/gtk/_core.py @@ -12255,7 +12255,7 @@ class Sizer(Object): def GetItem(*args, **kwargs): """ - GetItem(self, item) -> wx.SizerItem + GetItem(self, item, recursive=False) -> wx.SizerItem Returns the `wx.SizerItem` which holds the *item* given. The *item* parameter can be either a window, a sizer, or the zero-based index of diff --git a/wxPython/src/gtk/_core_wrap.cpp b/wxPython/src/gtk/_core_wrap.cpp index 3c18d3c95a..0d359f8e19 100644 --- a/wxPython/src/gtk/_core_wrap.cpp +++ b/wxPython/src/gtk/_core_wrap.cpp @@ -4304,14 +4304,14 @@ SWIGINTERN bool wxSizer_Detach(wxSizer *self,PyObject *item){ else return false; } -SWIGINTERN wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item){ +SWIGINTERN wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item,bool recursive=false){ wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPyEndBlockThreads(blocked); if ( info.window ) - return self->GetItem(info.window); + return self->GetItem(info.window, recursive); else if ( info.sizer ) - return self->GetItem(info.sizer); + return self->GetItem(info.sizer, recursive); else if ( info.gotPos ) return self->GetItem(info.pos); else @@ -51059,25 +51059,36 @@ SWIGINTERN PyObject *_wrap_Sizer_GetItem(PyObject *SWIGUNUSEDPARM(self), PyObjec PyObject *resultobj = 0; wxSizer *arg1 = (wxSizer *) 0 ; PyObject *arg2 = (PyObject *) 0 ; + bool arg3 = (bool) false ; wxSizerItem *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "recursive", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_GetItem",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Sizer_GetItem",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetItem" "', expected argument " "1"" of type '" "wxSizer *""'"); } arg1 = reinterpret_cast< wxSizer * >(argp1); arg2 = obj1; + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Sizer_GetItem" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2); + result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } diff --git a/wxPython/src/mac/_core.py b/wxPython/src/mac/_core.py index bc08380262..382f2c24a9 100644 --- a/wxPython/src/mac/_core.py +++ b/wxPython/src/mac/_core.py @@ -12255,7 +12255,7 @@ class Sizer(Object): def GetItem(*args, **kwargs): """ - GetItem(self, item) -> wx.SizerItem + GetItem(self, item, recursive=False) -> wx.SizerItem Returns the `wx.SizerItem` which holds the *item* given. The *item* parameter can be either a window, a sizer, or the zero-based index of diff --git a/wxPython/src/mac/_core_wrap.cpp b/wxPython/src/mac/_core_wrap.cpp index 9a882f04e9..0e381d9de3 100644 --- a/wxPython/src/mac/_core_wrap.cpp +++ b/wxPython/src/mac/_core_wrap.cpp @@ -4303,14 +4303,14 @@ SWIGINTERN bool wxSizer_Detach(wxSizer *self,PyObject *item){ else return false; } -SWIGINTERN wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item){ +SWIGINTERN wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item,bool recursive=false){ wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPyEndBlockThreads(blocked); if ( info.window ) - return self->GetItem(info.window); + return self->GetItem(info.window, recursive); else if ( info.sizer ) - return self->GetItem(info.sizer); + return self->GetItem(info.sizer, recursive); else if ( info.gotPos ) return self->GetItem(info.pos); else @@ -51058,25 +51058,36 @@ SWIGINTERN PyObject *_wrap_Sizer_GetItem(PyObject *SWIGUNUSEDPARM(self), PyObjec PyObject *resultobj = 0; wxSizer *arg1 = (wxSizer *) 0 ; PyObject *arg2 = (PyObject *) 0 ; + bool arg3 = (bool) false ; wxSizerItem *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "recursive", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_GetItem",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Sizer_GetItem",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetItem" "', expected argument " "1"" of type '" "wxSizer *""'"); } arg1 = reinterpret_cast< wxSizer * >(argp1); arg2 = obj1; + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Sizer_GetItem" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2); + result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; } diff --git a/wxPython/src/msw/_core.py b/wxPython/src/msw/_core.py index bc34ed6120..7a923bd829 100644 --- a/wxPython/src/msw/_core.py +++ b/wxPython/src/msw/_core.py @@ -12259,7 +12259,7 @@ class Sizer(Object): def GetItem(*args, **kwargs): """ - GetItem(self, item) -> wx.SizerItem + GetItem(self, item, recursive=False) -> wx.SizerItem Returns the `wx.SizerItem` which holds the *item* given. The *item* parameter can be either a window, a sizer, or the zero-based index of diff --git a/wxPython/src/msw/_core_wrap.cpp b/wxPython/src/msw/_core_wrap.cpp index 89ebea237a..af0ced2e55 100644 --- a/wxPython/src/msw/_core_wrap.cpp +++ b/wxPython/src/msw/_core_wrap.cpp @@ -4288,14 +4288,14 @@ SWIGINTERN bool wxSizer_Detach(wxSizer *self,PyObject *item){ else return false; } -SWIGINTERN wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item){ +SWIGINTERN wxSizerItem *wxSizer_GetItem(wxSizer *self,PyObject *item,bool recursive=false){ wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPyEndBlockThreads(blocked); if ( info.window ) - return self->GetItem(info.window); + return self->GetItem(info.window, recursive); else if ( info.sizer ) - return self->GetItem(info.sizer); + return self->GetItem(info.sizer, recursive); else if ( info.gotPos ) return self->GetItem(info.pos); else @@ -51084,25 +51084,36 @@ SWIGINTERN PyObject *_wrap_Sizer_GetItem(PyObject *SWIGUNUSEDPARM(self), PyObjec PyObject *resultobj = 0; wxSizer *arg1 = (wxSizer *) 0 ; PyObject *arg2 = (PyObject *) 0 ; + bool arg3 = (bool) false ; wxSizerItem *result = 0 ; void *argp1 = 0 ; int res1 = 0 ; + bool val3 ; + int ecode3 = 0 ; PyObject * obj0 = 0 ; PyObject * obj1 = 0 ; + PyObject * obj2 = 0 ; char * kwnames[] = { - (char *) "self",(char *) "item", NULL + (char *) "self",(char *) "item",(char *) "recursive", NULL }; - if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO:Sizer_GetItem",kwnames,&obj0,&obj1)) SWIG_fail; + if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"OO|O:Sizer_GetItem",kwnames,&obj0,&obj1,&obj2)) SWIG_fail; res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 ); if (!SWIG_IsOK(res1)) { SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetItem" "', expected argument " "1"" of type '" "wxSizer *""'"); } arg1 = reinterpret_cast< wxSizer * >(argp1); arg2 = obj1; + if (obj2) { + ecode3 = SWIG_AsVal_bool(obj2, &val3); + if (!SWIG_IsOK(ecode3)) { + SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "Sizer_GetItem" "', expected argument " "3"" of type '" "bool""'"); + } + arg3 = static_cast< bool >(val3); + } { PyThreadState* __tstate = wxPyBeginAllowThreads(); - result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2); + result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2,arg3); wxPyEndAllowThreads(__tstate); if (PyErr_Occurred()) SWIG_fail; }