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

fix for crash in wxTreeCtrl::GetSelections() when the tree is empty

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7463 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-05-23 06:01:58 +00:00
parent 3844b70dd8
commit 9047a3c139
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/generic/treectrl.cpp
View File

@@ -1407,14 +1407,19 @@ void wxTreeCtrl::FillArray(wxGenericTreeItem *item,
wxArrayGenericTreeItems& children = item->GetChildren(); wxArrayGenericTreeItems& children = item->GetChildren();
size_t count = children.GetCount(); size_t count = children.GetCount();
for ( size_t n = 0; n < count; ++n ) for ( size_t n = 0; n < count; ++n )
FillArray(children[n],array); FillArray(children[n], array);
} }
} }
size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds &array) const size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds &array) const
{ {
array.Empty(); array.Empty();
FillArray(GetRootItem().m_pItem, array); wxTreeItemId idRoot = GetRootItem();
if ( idRoot.IsOk() )
{
FillArray(idRoot.m_pItem, array);
}
//else: the tree is empty, so no selections
return array.Count(); return array.Count();
} }