Add missing picker files for gtk1

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

diff --git a/src/common/treebase.cpp b/src/common/treebase.cpp
index 50a8c96f811392dfee5562e17a59fa48371663cf..e38866e7d14bd7714221b68416950ee11e7e2889 100644 (file)
--- a/src/common/treebase.cpp
+++ b/src/common/treebase.cpp
@@ -17,10 +17,6 @@
 // headers
 // -----------------------------------------------------------------------------
 
 // 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"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -30,14 +26,8 @@
 
 #if wxUSE_TREECTRL
 
 
 #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
 
 // ----------------------------------------------------------------------------
 // events


@@ -90,14 +80,78 @@ wxTreeEvent::wxTreeEvent(const wxTreeEvent & event)
     m_editCancelled = event.m_editCancelled;
 }
 
     m_editCancelled = event.m_editCancelled;
 }
 

-#if WXWIN_COMPATIBILITY_2_2
+// ----------------------------------------------------------------------------
+// wxTreeCtrlBase
+// ----------------------------------------------------------------------------
+
+wxTreeCtrlBase::~wxTreeCtrlBase()
+{
+    if (m_ownsImageListNormal)
+        delete m_imageListNormal;
+    if (m_ownsImageListState)
+        delete m_imageListState;
+}

 
 

-int wxTreeEvent::GetCode() const
+static void wxGetBestTreeSize(const wxTreeCtrlBase* treeCtrl, const wxTreeItemId& id, wxSize& size)

 {
 {

-    return m_evtKey.GetKeyCode();
+    wxRect rect;
+    
+    if ( treeCtrl->GetBoundingRect(id, 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;
+    }
+
+    wxTreeItemIdValue cookie;
+    for ( wxTreeItemId item = treeCtrl->GetFirstChild(id, cookie);
+          item.IsOk();
+          item = treeCtrl->GetNextChild(item, cookie) )
+    {
+        wxGetBestTreeSize(treeCtrl, item, size);
+    }

 }
 
 }
 

-#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
+    
+    if (GetQuickBestSize())
+    {
+        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;
+            }
+        }
+    }
+    else
+        wxGetBestTreeSize(this, GetRootItem(), size);
+
+    // need some minimal size even for empty tree
+    if ( !size.x || !size.y )
+        size = wxControl::DoGetBestSize();
+    else
+        CacheBestSize(size);
+
+    return size;
+}

 
 #endif // wxUSE_TREECTRL
 
 
 #endif // wxUSE_TREECTRL