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

Parts of wxSizer::Show() extracted into wxSizer::GetItem() (together with documentation).

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29884 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-10-15 18:58:52 +00:00
parent 15513a8066
commit 9f13661f8b
4 changed files with 85 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/common/sizer.cpp
View File

@@ -760,9 +760,9 @@ bool wxSizer::DoSetItemMinSize( size_t index, int width, int height )
return true;
}
bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
wxSizerItem* wxSizer::GetItem( wxWindow *window, bool recursive )
{
wxASSERT_MSG( window, _T("Show for NULL window") );
wxASSERT_MSG( window, _T("GetItem for NULL window") );
wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
@@ -771,44 +771,77 @@ bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
if (item->GetWindow() == window)
{
item->Show( show );
return true;
return item;
}
else if (recursive && item->IsSizer())
{
if (item->GetSizer()->Show(window, show, recursive))
return true;
wxSizerItem *subitem = item->GetSizer()->GetItem( window, true );
if (subitem)
return subitem;
}
node = node->GetNext();
}
return NULL;
}
wxSizerItem* wxSizer::GetItem( wxSizer *sizer, bool recursive )
{
wxASSERT_MSG( sizer, _T("GetItem for NULL sizer") );
wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
{
wxSizerItem *item = node->GetData();
if (item->GetSizer() == sizer)
{
return item;
}
else if (recursive && item->IsSizer())
{
wxSizerItem *subitem = item->GetSizer()->GetItem( sizer, true );
if (subitem)
return subitem;
}
node = node->GetNext();
}
return NULL;
}
wxSizerItem* wxSizer::GetItem( size_t index )
{
wxCHECK_MSG( index < m_children.GetCount(),
NULL,
_T("GetItem index is out of range") );
return m_children.Item( index )->GetData();
}
bool wxSizer::Show( wxWindow *window, bool show, bool recursive )
{
wxSizerItem *item = GetItem( window, recursive );
if ( item )
{
item->Show( show );
return true;
}
return false;
}
bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive )
{
wxASSERT_MSG( sizer, _T("Show for NULL sizer") );
wxSizerItem *item = GetItem( sizer, recursive );
wxSizerItemList::compatibility_iterator node = m_children.GetFirst();
while (node)
if ( item )
{
wxSizerItem *item = node->GetData();
if (item->GetSizer() == sizer)
{
item->Show( show );
return true;
}
else if (recursive && item->IsSizer())
{
if (item->GetSizer()->Show(sizer, show, recursive))
return true;
}
node = node->GetNext();
item->Show( show );
return true;
}
return false;
@@ -816,13 +849,15 @@ bool wxSizer::Show( wxSizer *sizer, bool show, bool recursive )
bool wxSizer::Show( size_t index, bool show)
{
wxCHECK_MSG( index < m_children.GetCount(),
false,
_T("Show index is out of range") );
wxSizerItem *item = GetItem( index );
m_children.Item( index )->GetData()->Show( show );
if ( item )
{
item->Show( show );
return true;
}
return true;
return false;
}
void wxSizer::ShowItems( bool show )