Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing 'recursive' parameter to wx.Sizer.GetItem

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@44590 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2007-03-01 19:35:26 +00:00
parent b1ea5b28ab
commit 0aeaaaaf31
7 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wxPython/src/_sizers.i
View File

@@ -903,18 +903,18 @@ was found and detached.", "");
DocAStr(GetItem, 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* "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 parameter can be either a window, a sizer, or the zero-based index of
the item to be found.", ""); the item to be found.", "");
wxSizerItem* GetItem(PyObject* item) { wxSizerItem* GetItem(PyObject* item, bool recursive=false) {
wxPyBlock_t blocked = wxPyBeginBlockThreads(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
if ( info.window ) if ( info.window )
return self->GetItem(info.window); return self->GetItem(info.window, recursive);
else if ( info.sizer ) else if ( info.sizer )
return self->GetItem(info.sizer); return self->GetItem(info.sizer, recursive);
else if ( info.gotPos ) else if ( info.gotPos )
return self->GetItem(info.pos); return self->GetItem(info.pos);
else else

2
wxPython/src/gtk/_core.py
View File

@@ -12255,7 +12255,7 @@ class Sizer(Object):
def GetItem(*args, **kwargs): 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* 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 parameter can be either a window, a sizer, or the zero-based index of

23
wxPython/src/gtk/_core_wrap.cpp
View File

@@ -4304,14 +4304,14 @@ SWIGINTERN bool wxSizer_Detach(wxSizer *self,PyObject *item){
else else
return false; 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(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
if ( info.window ) if ( info.window )
return self->GetItem(info.window); return self->GetItem(info.window, recursive);
else if ( info.sizer ) else if ( info.sizer )
return self->GetItem(info.sizer); return self->GetItem(info.sizer, recursive);
else if ( info.gotPos ) else if ( info.gotPos )
return self->GetItem(info.pos); return self->GetItem(info.pos);
else else
@@ -51059,25 +51059,36 @@ SWIGINTERN PyObject *_wrap_Sizer_GetItem(PyObject *SWIGUNUSEDPARM(self), PyObjec
PyObject *resultobj = 0; PyObject *resultobj = 0;
wxSizer *arg1 = (wxSizer *) 0 ; wxSizer *arg1 = (wxSizer *) 0 ;
PyObject *arg2 = (PyObject *) 0 ; PyObject *arg2 = (PyObject *) 0 ;
bool arg3 = (bool) false ;
wxSizerItem *result = 0 ; wxSizerItem *result = 0 ;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
bool val3 ;
int ecode3 = 0 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = { 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 ); res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 );
if (!SWIG_IsOK(res1)) { if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetItem" "', expected argument " "1"" of type '" "wxSizer *""'"); SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetItem" "', expected argument " "1"" of type '" "wxSizer *""'");
} }
arg1 = reinterpret_cast< wxSizer * >(argp1); arg1 = reinterpret_cast< wxSizer * >(argp1);
arg2 = obj1; 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(); PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2); result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2,arg3);
wxPyEndAllowThreads(__tstate); wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail; if (PyErr_Occurred()) SWIG_fail;
} }

2
wxPython/src/mac/_core.py
View File

@@ -12255,7 +12255,7 @@ class Sizer(Object):
def GetItem(*args, **kwargs): 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* 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 parameter can be either a window, a sizer, or the zero-based index of

23
wxPython/src/mac/_core_wrap.cpp
View File

@@ -4303,14 +4303,14 @@ SWIGINTERN bool wxSizer_Detach(wxSizer *self,PyObject *item){
else else
return false; 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(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
if ( info.window ) if ( info.window )
return self->GetItem(info.window); return self->GetItem(info.window, recursive);
else if ( info.sizer ) else if ( info.sizer )
return self->GetItem(info.sizer); return self->GetItem(info.sizer, recursive);
else if ( info.gotPos ) else if ( info.gotPos )
return self->GetItem(info.pos); return self->GetItem(info.pos);
else else
@@ -51058,25 +51058,36 @@ SWIGINTERN PyObject *_wrap_Sizer_GetItem(PyObject *SWIGUNUSEDPARM(self), PyObjec
PyObject *resultobj = 0; PyObject *resultobj = 0;
wxSizer *arg1 = (wxSizer *) 0 ; wxSizer *arg1 = (wxSizer *) 0 ;
PyObject *arg2 = (PyObject *) 0 ; PyObject *arg2 = (PyObject *) 0 ;
bool arg3 = (bool) false ;
wxSizerItem *result = 0 ; wxSizerItem *result = 0 ;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
bool val3 ;
int ecode3 = 0 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = { 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 ); res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 );
if (!SWIG_IsOK(res1)) { if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetItem" "', expected argument " "1"" of type '" "wxSizer *""'"); SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetItem" "', expected argument " "1"" of type '" "wxSizer *""'");
} }
arg1 = reinterpret_cast< wxSizer * >(argp1); arg1 = reinterpret_cast< wxSizer * >(argp1);
arg2 = obj1; 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(); PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2); result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2,arg3);
wxPyEndAllowThreads(__tstate); wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail; if (PyErr_Occurred()) SWIG_fail;
} }

2
wxPython/src/msw/_core.py
View File

@@ -12259,7 +12259,7 @@ class Sizer(Object):
def GetItem(*args, **kwargs): 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* 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 parameter can be either a window, a sizer, or the zero-based index of

23
wxPython/src/msw/_core_wrap.cpp
View File

@@ -4288,14 +4288,14 @@ SWIGINTERN bool wxSizer_Detach(wxSizer *self,PyObject *item){
else else
return false; 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(); wxPyBlock_t blocked = wxPyBeginBlockThreads();
wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true); wxPySizerItemInfo info = wxPySizerItemTypeHelper(item, false, true);
wxPyEndBlockThreads(blocked); wxPyEndBlockThreads(blocked);
if ( info.window ) if ( info.window )
return self->GetItem(info.window); return self->GetItem(info.window, recursive);
else if ( info.sizer ) else if ( info.sizer )
return self->GetItem(info.sizer); return self->GetItem(info.sizer, recursive);
else if ( info.gotPos ) else if ( info.gotPos )
return self->GetItem(info.pos); return self->GetItem(info.pos);
else else
@@ -51084,25 +51084,36 @@ SWIGINTERN PyObject *_wrap_Sizer_GetItem(PyObject *SWIGUNUSEDPARM(self), PyObjec
PyObject *resultobj = 0; PyObject *resultobj = 0;
wxSizer *arg1 = (wxSizer *) 0 ; wxSizer *arg1 = (wxSizer *) 0 ;
PyObject *arg2 = (PyObject *) 0 ; PyObject *arg2 = (PyObject *) 0 ;
bool arg3 = (bool) false ;
wxSizerItem *result = 0 ; wxSizerItem *result = 0 ;
void *argp1 = 0 ; void *argp1 = 0 ;
int res1 = 0 ; int res1 = 0 ;
bool val3 ;
int ecode3 = 0 ;
PyObject * obj0 = 0 ; PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ; PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
char * kwnames[] = { 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 ); res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_wxSizer, 0 | 0 );
if (!SWIG_IsOK(res1)) { if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetItem" "', expected argument " "1"" of type '" "wxSizer *""'"); SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Sizer_GetItem" "', expected argument " "1"" of type '" "wxSizer *""'");
} }
arg1 = reinterpret_cast< wxSizer * >(argp1); arg1 = reinterpret_cast< wxSizer * >(argp1);
arg2 = obj1; 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(); PyThreadState* __tstate = wxPyBeginAllowThreads();
result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2); result = (wxSizerItem *)wxSizer_GetItem(arg1,arg2,arg3);
wxPyEndAllowThreads(__tstate); wxPyEndAllowThreads(__tstate);
if (PyErr_Occurred()) SWIG_fail; if (PyErr_Occurred()) SWIG_fail;
} }