Add markup support to wxMSW wxButton and show it in the sample.

[wxWidgets.git] / src / common / treebase.cpp

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index c8b990630793295f3b6653bc049e5e4a40005742..57cfed1d197ac6eb8e2a59a72fefbbfd9821bc4d 100644 (file)
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -29,6 +29,8 @@
 #include "wx/treectrl.h"
 #include "wx/imaglist.h"
 
+extern WXDLLEXPORT_DATA(const char) wxTreeCtrlNameStr[] = "treeCtrl";
+
 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------
@@ -321,8 +323,10 @@ void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item)
         CollapseAllChildren(idCurr);
     }
 
-    // then collapse this element too
-    Collapse(item);
+    // then collapse this element too unless it's the hidden root which can't
+    // be collapsed
+    if ( item != GetRootItem() || !HasFlag(wxTR_HIDE_ROOT) )
+        Collapse(item);
     Thaw();
 }