add wxGenericStaticText (#9656)

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

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index d4244576a76b7f47855de1f90d353e10bacefb40..7a1a2d8fcf594f8eb9df053e1136a1c2b43612d1 100644 (file)
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -106,6 +106,31 @@ wxTreeCtrlBase::~wxTreeCtrlBase()
         delete m_imageListState;
 }
 
         delete m_imageListState;
 }
 

+void wxTreeCtrlBase::SetItemState(const wxTreeItemId& item, int state)
+{
+    if ( state == wxTREE_ITEMSTATE_NEXT )
+    {
+        int current = GetItemState(item);
+        if ( current == wxTREE_ITEMSTATE_NONE )
+            return;
+        state = current + 1;
+        if ( m_imageListState && state >= m_imageListState->GetImageCount() )
+            state = 0;
+    }
+    else if ( state == wxTREE_ITEMSTATE_PREV )
+    {
+        int current = GetItemState(item);
+        if ( current == wxTREE_ITEMSTATE_NONE )
+            return;
+        state = current - 1;
+        if ( state == -1 )
+            state = m_imageListState ? m_imageListState->GetImageCount() - 1 : 0;
+    }
+    // else: wxTREE_ITEMSTATE_NONE depending on platform
+
+    DoSetItemState(item, state);
+}
+

 static void
 wxGetBestTreeSize(const wxTreeCtrlBase* treeCtrl, wxTreeItemId id, wxSize& size)
 {
 static void
 wxGetBestTreeSize(const wxTreeCtrlBase* treeCtrl, wxTreeItemId id, wxSize& size)
 {


@@ -113,6 +138,12 @@ wxGetBestTreeSize(const wxTreeCtrlBase* treeCtrl, wxTreeItemId id, wxSize& size)
 
     if ( treeCtrl->GetBoundingRect(id, rect, true /* just the item */) )
     {
 
     if ( treeCtrl->GetBoundingRect(id, rect, true /* just the item */) )
     {

+        // Translate to logical position so we get the full extent
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
+        rect.x += treeCtrl->GetScrollPos(wxHORIZONTAL);
+        rect.y += treeCtrl->GetScrollPos(wxVERTICAL);
+#endif
+

         size.IncTo(wxSize(rect.GetRight(), rect.GetBottom()));
     }
 
         size.IncTo(wxSize(rect.GetRight(), rect.GetBottom()));
     }
 


@@ -156,7 +187,9 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
     else // use precise, if potentially slow, size computation method
     {
         // iterate over all items recursively
     else // use precise, if potentially slow, size computation method
     {
         // iterate over all items recursively

-        wxGetBestTreeSize(this, GetRootItem(), size);
+        wxTreeItemId idRoot = GetRootItem();
+        if ( idRoot.IsOk() )
+            wxGetBestTreeSize(this, idRoot, size);

     }
 
     // need some minimal size even for empty tree
     }
 
     // need some minimal size even for empty tree


@@ -175,14 +208,20 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
 
 void wxTreeCtrlBase::ExpandAll()
 {
 
 void wxTreeCtrlBase::ExpandAll()
 {

+    if ( IsEmpty() )
+        return;
+

     ExpandAllChildren(GetRootItem());
 }
 
 void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
 {
     ExpandAllChildren(GetRootItem());
 }
 
 void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
 {

+    Freeze();

     // expand this item first, this might result in its children being added on
     // the fly
     // 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;
 
     // then (recursively) expand all the children
     wxTreeItemIdValue cookie;


@@ -192,7 +231,37 @@ void wxTreeCtrlBase::ExpandAllChildren(const wxTreeItemId& item)
     {
         ExpandAllChildren(idCurr);
     }
     {
         ExpandAllChildren(idCurr);
     }

+    Thaw();

 }
 
 }
 

-#endif // wxUSE_TREECTRL
+void wxTreeCtrlBase::CollapseAll()
+{
+    if ( IsEmpty() )
+        return;
+
+    CollapseAllChildren(GetRootItem());
+}

 
 

+void wxTreeCtrlBase::CollapseAllChildren(const wxTreeItemId& item)
+{
+    Freeze();
+    // first (recursively) collapse all the children
+    wxTreeItemIdValue cookie;
+    for ( wxTreeItemId idCurr = GetFirstChild(item, cookie);
+          idCurr.IsOk();
+          idCurr = GetNextChild(item, cookie) )
+    {
+        CollapseAllChildren(idCurr);
+    }
+
+    // then collapse this element too
+    Collapse(item);
+    Thaw();
+}
+
+bool wxTreeCtrlBase::IsEmpty() const
+{
+    return !GetRootItem().IsOk();
+}
+
+#endif // wxUSE_TREECTRL