Calculate correct client size for windows that are using deferred sizing.

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

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 6814ed0926f2daabc0463a83995d9c4673c05318..7b42fdd35ed71e61c7dad5d4b2ec9332e9fb47c4 100644 (file)
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -26,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
@@ -86,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