X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec157c8f95dfa40b19202a320e7a1d60995d2c8e..cb0b7b7d811356f729315fc14c7e0d311f43384d:/src/common/treebase.cpp diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp index 50a8c96f81..7b42fdd35e 100644 --- a/src/common/treebase.cpp +++ b/src/common/treebase.cpp @@ -17,10 +17,6 @@ // headers // ----------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "treebase.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -30,14 +26,8 @@ #if wxUSE_TREECTRL -#include "wx/treebase.h" -#include "wx/settings.h" -#include "wx/log.h" -#include "wx/intl.h" -#include "wx/dynarray.h" -#include "wx/arrimpl.cpp" -#include "wx/dcclient.h" - +#include "wx/treectrl.h" +#include "wx/imaglist.h" // ---------------------------------------------------------------------------- // events @@ -90,14 +80,49 @@ wxTreeEvent::wxTreeEvent(const wxTreeEvent & event) m_editCancelled = event.m_editCancelled; } -#if WXWIN_COMPATIBILITY_2_2 +// ---------------------------------------------------------------------------- +// wxTreeCtrlBase +// ---------------------------------------------------------------------------- -int wxTreeEvent::GetCode() const +wxTreeCtrlBase::~wxTreeCtrlBase() { - return m_evtKey.GetKeyCode(); + if (m_ownsImageListNormal) + delete m_imageListNormal; + if (m_ownsImageListState) + delete m_imageListState; } -#endif // WXWIN_COMPATIBILITY_2_2 +wxSize wxTreeCtrlBase::DoGetBestSize() const +{ + wxSize size; + + // this doesn't really compute the total bounding rectangle of all items + // but a not too bad guess of it which has the advantage of not having to + // examine all (potentially hundreds or thousands) items in the control + for ( wxTreeItemId item = GetRootItem(); + item.IsOk(); + item = GetLastChild(item) ) + { + wxRect rect; + + // last parameter is "true" to get only the dimensions of the text + // label, we don't want to get the entire item width as it's determined + // by the current size + if ( GetBoundingRect(item, rect, true) ) + { + if ( size.x < rect.x + rect.width ) + size.x = rect.x + rect.width; + if ( size.y < rect.y + rect.height ) + size.y = rect.y + rect.height; + } + } + + // need some minimal size even for empty tree + if ( !size.x || !size.y ) + size = wxControl::DoGetBestSize(); + + return size; +} #endif // wxUSE_TREECTRL