X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9248adc8da5476a48d6e0263f4683b87f7b899d4..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/common/treebase.cpp?ds=sidebyside diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp index f10e2af927..4bd01ace53 100644 --- a/src/common/treebase.cpp +++ b/src/common/treebase.cpp @@ -191,9 +191,12 @@ void wxTreeCtrlBase::ExpandAll() void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item) { + Freeze(); // expand this item first, this might result in its children being added on // the fly - Expand(item); + if ( item != GetRootItem() || !HasFlag(wxTR_HIDE_ROOT) ) + Expand(item); + //else: expanding hidden root item is unsupported and unnecessary // then (recursively) expand all the children wxTreeItemIdValue cookie; @@ -203,6 +206,7 @@ void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item) { ExpandAllChildren(idCurr); } + Thaw(); } void wxTreeCtrlBase::CollapseAll() @@ -215,6 +219,7 @@ void wxTreeCtrlBase::CollapseAll() void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item) { + Freeze(); // first (recursively) collapse all the children wxTreeItemIdValue cookie; for ( wxTreeItemId idCurr = GetFirstChild(item, cookie); @@ -226,6 +231,7 @@ void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item) // then collapse this element too Collapse(item); + Thaw(); } bool wxTreeCtrlBase::IsEmpty() const