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

Applied #11106: wxGenericDirCtrl can get into a state where it will no longer expand

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62094 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2009-09-24 17:04:44 +00:00
parent c25bb73116
commit 5b806097fd
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/generic/dirctrlg.cpp
View File

@@ -785,19 +785,12 @@ void wxGenericDirCtrl::CollapseDir(wxTreeItemId parentId)
return; return;
data->m_isExpanded = false; data->m_isExpanded = false;
wxTreeItemIdValue cookie;
/* Workaround because DeleteChildren has disapeared (why?) and m_treeCtrl->Freeze();
* CollapseAndReset doesn't work as advertised (deletes parent too) */
child = m_treeCtrl->GetFirstChild(parentId, cookie);
while (child.IsOk())
{
m_treeCtrl->Delete(child);
/* Not GetNextChild below, because the cookie mechanism can't
* handle disappearing children! */
child = m_treeCtrl->GetFirstChild(parentId, cookie);
}
if (parentId != m_treeCtrl->GetRootItem()) if (parentId != m_treeCtrl->GetRootItem())
m_treeCtrl->Collapse(parentId); m_treeCtrl->CollapseAndReset(parentId);
m_treeCtrl->DeleteChildren(parentId);
m_treeCtrl->Thaw();
} }
void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId) void wxGenericDirCtrl::ExpandDir(wxTreeItemId parentId)