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()));
}
else // use precise, if potentially slow, size computation method
{
// iterate over all items recursively
- wxGetBestTreeSize(this, GetRootItem(), size);
-
- // but the above doesn't take into account the icon items nor the tree
- // "+"/"-" buttons which have about the same size
- wxCoord iconWidth, iconHeight;
- if ( !m_imageListNormal ||
- !m_imageListNormal->GetImageCount() ||
- !m_imageListNormal->GetSize(0, iconWidth, iconHeight) )
- {
- // FIXME: what is the default size of the tree buttons?
- iconWidth =
- iconHeight = 16;
- }
-
- // account for the icons if we have them
- if ( m_imageListNormal )
- {
- // FIXME: and how to get the margin? better be large...
- size.x += iconWidth + 10;
- }
-
- // and for the buttons always
- if ( !HasFlag(wxTR_NO_BUTTONS) )
- size.x += iconWidth;
+ wxTreeItemId idRoot = GetRootItem();
+ if ( idRoot.IsOk() )
+ wxGetBestTreeSize(this, idRoot, size);
}
// need some minimal size even for empty tree
if ( !size.x || !size.y )
size = wxControl::DoGetBestSize();
else
+ {
+ // Add border size
+ size += GetWindowBorderSize();
+
CacheBestSize(size);
+ }
return size;
}