reverted the last fix, it was just wrong, sorry, the problem is elsewhere
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43023 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -157,29 +157,6 @@ wxSize wxTreeCtrlBase::DoGetBestSize() const
|
|||||||
{
|
{
|
||||||
// iterate over all items recursively
|
// iterate over all items recursively
|
||||||
wxGetBestTreeSize(this, GetRootItem(), size);
|
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// need some minimal size even for empty tree
|
// need some minimal size even for empty tree
|
||||||
|
Reference in New Issue
Block a user