don't update the tree unnecessarily in Expand/CollapseAllChildren() (patch 1809520)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 74998a35cab5dec77ad18790430d04ff9d14757d..a5ce3575356cd016ed057da5a65185e71441bac1 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -205,6 +205,7 @@ All (GUI):
   behaviour of GetNextSibling() consistent between wxMSW and generic versions.
 - Merged wxRichTextAttr and wxTextAttrEx into wxTextAttr, and added a font table
   to wxRichTextBuffer to reduce wxFont consumption and increase performance.
   behaviour of GetNextSibling() consistent between wxMSW and generic versions.
 - Merged wxRichTextAttr and wxTextAttrEx into wxTextAttr, and added a font table
   to wxRichTextBuffer to reduce wxFont consumption and increase performance.

+- Optimize wxGenericTreeCtrl::Collapse/ExpandAllChildren() (Szczepan Holyszewski)

 
 wxGTK:
 
 
 wxGTK:
 

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index eb37c0dbdb1aef6c7fa7520b31cf62d2f906bbed..4bd01ace539a11f47635039602ed18495b2225c6 100644 (file)
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -191,6 +191,7 @@ void wxTreeCtrlBase::ExpandAll()
 
 void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
 {
 
 void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
 {

+    Freeze();

     // expand this item first, this might result in its children being added on
     // the fly
     if ( item != GetRootItem() || !HasFlag(wxTR_HIDE_ROOT) )
     // expand this item first, this might result in its children being added on
     // the fly
     if ( item != GetRootItem() || !HasFlag(wxTR_HIDE_ROOT) )


@@ -205,6 +206,7 @@ void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
     {
         ExpandAllChildren(idCurr);
     }
     {
         ExpandAllChildren(idCurr);
     }

+    Thaw();

 }
 
 void wxTreeCtrlBase::CollapseAll()
 }
 
 void wxTreeCtrlBase::CollapseAll()


@@ -217,6 +219,7 @@ void wxTreeCtrlBase::CollapseAll()
 
 void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item)
 {
 
 void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item)
 {

+    Freeze();

     // first (recursively) collapse all the children
     wxTreeItemIdValue cookie;
     for ( wxTreeItemId idCurr = GetFirstChild(item, cookie);
     // first (recursively) collapse all the children
     wxTreeItemIdValue cookie;
     for ( wxTreeItemId idCurr = GetFirstChild(item, cookie);


@@ -228,6 +231,7 @@ void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item)
 
     // then collapse this element too
     Collapse(item);
 
     // then collapse this element too
     Collapse(item);

+    Thaw();

 }
 
 bool wxTreeCtrlBase::IsEmpty() const
 }
 
 bool wxTreeCtrlBase::IsEmpty() const

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 87a01089a1de020f8d9126115c9c9a5cf7dcdbf8..d30b80d4f0e97e691557f4972a845a67d5cd479f 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -1646,9 +1646,16 @@ void wxGenericTreeCtrl::Expand(const wxTreeItemId& itemId)
     }
 
     item->Expand();
     }
 
     item->Expand();

-    CalculatePositions();
+    if ( !m_freezeCount )
+    {
+        CalculatePositions();

 
 

-    RefreshSubtree(item);
+        RefreshSubtree(item);
+    }
+    else // frozen
+    {
+        m_dirty = true;
+    }

 
     event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
     GetEventHandler()->ProcessEvent( event );
 
     event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
     GetEventHandler()->ProcessEvent( event );


@@ -3582,7 +3589,10 @@ void wxGenericTreeCtrl::Thaw()
 
     if ( --m_freezeCount == 0 )
     {
 
     if ( --m_freezeCount == 0 )
     {

-        Refresh();
+        if ( m_dirty )
+            DoDirtyProcessing();
+        else
+            Refresh();

     }
 }
 
     }
 }