From ffda4dacbd083c90513b7ee078bd5551a7e4dea6 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 10 Jun 2004 12:06:10 +0000 Subject: [PATCH] count the root item in wxTreeCtrl::GetCount() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27726 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/generic/treectlg.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp index 4a83697fd7..39d30b7614 100644 --- a/src/generic/treectlg.cpp +++ b/src/generic/treectlg.cpp @@ -825,7 +825,20 @@ wxGenericTreeCtrl::~wxGenericTreeCtrl() size_t wxGenericTreeCtrl::GetCount() const { - return m_anchor == NULL ? 0u : m_anchor->GetChildrenCount(); + if ( !m_anchor ) + { + // the tree is empty + return 0; + } + + size_t count = m_anchor->GetChildrenCount(); + if ( !HasFlag(wxTR_HIDE_ROOT) ) + { + // take the root itself into account + count++; + } + + return count; } void wxGenericTreeCtrl::SetIndent(unsigned int indent) -- 2.45.2