automtn.cpp removed for Borland compilation

[wxWidgets.git] / src / generic / treectrl.cpp

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 109827378a02a37482c865ad0744c3cca0331047..bb316835d7a859f96094de2aa32719d1ee2de513 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -1,193 +1,336 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        treectrl.cpp
 /////////////////////////////////////////////////////////////////////////////
 // Name:        treectrl.cpp

-// Purpose:
+// Purpose:     generic tree control implementation

 // Author:      Robert Roebling
 // Created:     01/02/97
 // Author:      Robert Roebling
 // Created:     01/02/97

+// Modified:    22/10/98 - almost total rewrite, simpler interface (VZ)

 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

+// =============================================================================
+// declarations
+// =============================================================================
+
+// -----------------------------------------------------------------------------
+// headers
+// -----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "treectrl.h"
+  #pragma implementation "treectrl.h"
+#endif
+
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop

 #endif
 
 #include "wx/treectrl.h"
 #endif
 
 #include "wx/treectrl.h"

+#include "wx/generic/imaglist.h"

 #include "wx/settings.h"
 #include "wx/log.h"
 #include "wx/settings.h"
 #include "wx/log.h"

-#include <wx/intl.h>
+#include "wx/intl.h"
+#include "wx/dynarray.h"
+#include "wx/arrimpl.cpp"
+#include "wx/dcclient.h"
+#include "wx/msgdlg.h"

 
 

-//-----------------------------------------------------------------------------
-// wxTreeItem
-//-----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+// array types
+// -----------------------------------------------------------------------------
+
+class WXDLLEXPORT wxGenericTreeItem;

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject)
+WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayGenericTreeItems);
+WX_DEFINE_OBJARRAY(wxArrayTreeItemIds);

 
 

-wxTreeItem::wxTreeItem()
+// -----------------------------------------------------------------------------
+// private classes
+// -----------------------------------------------------------------------------
+
+// a tree item
+class WXDLLEXPORT wxGenericTreeItem

 {
 {

-  m_mask = 0;
-  m_itemId = 0;
-  m_state = 0;
-  m_stateMask = 0;
-  m_image = -1;
-  m_selectedImage = -1;
-  m_children = 0;
-  m_data = 0;
-}
+public:
+  // ctors & dtor
+  wxGenericTreeItem() { m_data = NULL; }
+  wxGenericTreeItem( wxGenericTreeItem *parent,
+                     const wxString& text,
+                     wxDC& dc,
+                     int image, int selImage,
+                     wxTreeItemData *data );

 
 

-//-----------------------------------------------------------------------------
-// wxTreeEvent
-//-----------------------------------------------------------------------------
+  ~wxGenericTreeItem();
+
+  // trivial accessors
+  wxArrayGenericTreeItems& GetChildren() { return m_children; }
+
+  const wxString& GetText() const { return m_text; }
+  int GetImage() const { return m_image; }
+  int GetSelectedImage() const { return m_selImage; }
+  wxTreeItemData *GetData() const { return m_data; }
+
+  void SetText( const wxString &text );
+  void SetImage(int image) { m_image = image; }
+  void SetSelectedImage(int image) { m_selImage = image; }
+  void SetData(wxTreeItemData *data) { m_data = data; }
+
+  void SetHasPlus(bool has = TRUE) { m_hasPlus = has; }
+
+  void SetBold(bool bold) { m_isBold = bold; }
+
+  int GetX() const { return m_x; }
+  int GetY() const { return m_y; }
+
+  void SetX(int x) { m_x = x; }
+  void SetY(int y) { m_y = y; }
+
+  int  GetHeight() const { return m_height; }
+  int  GetWidth()  const { return m_width; }
+
+  void SetHeight(int h) { m_height = h; }
+  void SetWidth(int w) { m_width = w; }
+
+
+  wxGenericTreeItem *GetParent() const { return m_parent; }
+
+  // operations
+    // deletes all children notifying the treectrl about it if !NULL pointer
+    // given
+  void DeleteChildren(wxTreeCtrl *tree = NULL);
+    // FIXME don't know what is it for
+  void Reset();
+
+  // get count of all children (and grand children if 'recursively')
+  size_t GetChildrenCount(bool recursively = TRUE) const;
+
+  void Insert(wxGenericTreeItem *child, size_t index)
+    { m_children.Insert(child, index); }
+
+  void SetCross( int x, int y );
+  void GetSize( int &x, int &y, const wxTreeCtrl* );
+
+  // return the item at given position (or NULL if no item), onButton is TRUE
+  // if the point belongs to the item's button, otherwise it lies on the
+  // button's label
+  wxGenericTreeItem *HitTest( const wxPoint& point, const wxTreeCtrl *, int &flags);
+
+  void Expand() { m_isCollapsed = FALSE; }
+  void Collapse() { m_isCollapsed = TRUE; }
+
+  void SetHilight( bool set = TRUE ) { m_hasHilight = set; }
+
+  // status inquiries
+  bool HasChildren() const { return !m_children.IsEmpty(); }
+  bool HasHilight()  const { return m_hasHilight; }
+  bool IsExpanded()  const { return !m_isCollapsed; }
+  bool HasPlus()     const { return m_hasPlus || HasChildren(); }
+  bool IsBold()      const { return m_isBold; }

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent,wxCommandEvent)
+private:
+  wxString            m_text;

 
 

-wxTreeEvent::wxTreeEvent( wxEventType commandType, int id ) :
-  wxCommandEvent( commandType, id )
+  int                 m_image,
+                      m_selImage;
+
+  wxTreeItemData     *m_data;
+
+  // use bitfields to save size
+  int                 m_isCollapsed :1;
+  int                 m_hasHilight  :1; // same as focused
+  int                 m_hasPlus     :1; // used for item which doesn't have
+                                        // children but still has a [+] button
+  int                 m_isBold      :1; // render the label in bold font
+
+  int                 m_x, m_y;
+  long                m_height, m_width;
+  int                 m_xCross, m_yCross;
+  int                 m_level;
+  wxArrayGenericTreeItems m_children;
+  wxGenericTreeItem  *m_parent;
+};
+
+// =============================================================================
+// implementation
+// =============================================================================
+
+
+// -----------------------------------------------------------------------------
+// wxTreeRenameTimer (internal)
+// -----------------------------------------------------------------------------
+
+wxTreeRenameTimer::wxTreeRenameTimer( wxTreeCtrl *owner )

 {
 {

-  m_code = 0;
-  m_oldItem = 0;
+    m_owner = owner;
+}
+
+void wxTreeRenameTimer::Notify()
+{
+    m_owner->OnRenameTimer();

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------

-// wxGenericTreeItem
+// wxTreeTextCtrl (internal)

 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxGenericTreeItem,wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxTreeTextCtrl,wxTextCtrl);

 
 

-wxGenericTreeItem::wxGenericTreeItem( wxGenericTreeItem *parent )
+BEGIN_EVENT_TABLE(wxTreeTextCtrl,wxTextCtrl)
+    EVT_CHAR           (wxTreeTextCtrl::OnChar)
+    EVT_KILL_FOCUS     (wxTreeTextCtrl::OnKillFocus)
+END_EVENT_TABLE()
+
+wxTreeTextCtrl::wxTreeTextCtrl( wxWindow *parent, const wxWindowID id,
+    bool *accept, wxString *res, wxTreeCtrl *owner,
+    const wxString &value, const wxPoint &pos, const wxSize &size,
+    int style, const wxValidator& validator, const wxString &name ) :
+  wxTextCtrl( parent, id, value, pos, size, style, validator, name )

 {
 {

-  Reset();
-  m_parent = parent;
-  m_hasHilight = FALSE;
+    m_res = res;
+    m_accept = accept;
+    m_owner = owner;

 }
 
 }
 

-wxGenericTreeItem::wxGenericTreeItem( wxGenericTreeItem *parent, const wxTreeItem& item, wxDC *dc )
+void wxTreeTextCtrl::OnChar( wxKeyEvent &event )

 {
 {

-  Reset();
-  SetItem( item, dc );
-  m_parent = parent;
-  m_hasHilight = FALSE;
+    if (event.m_keyCode == WXK_RETURN)
+    {
+        (*m_accept) = TRUE;
+        (*m_res) = GetValue();
+        m_owner->OnRenameAccept();
+        if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
+        return;
+    }
+    if (event.m_keyCode == WXK_ESCAPE)
+    {
+        (*m_accept) = FALSE;
+        (*m_res) = "";
+        if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
+        return;
+    }
+    event.Skip();

 }
 
 }
 

-void wxGenericTreeItem::SetItem( const wxTreeItem &item, wxDC *dc )
+void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )

 {
 {

-  if ((item.m_mask & wxTREE_MASK_HANDLE) == wxTREE_MASK_HANDLE)
-    m_itemId = item.m_itemId;
-  if ((item.m_mask & wxTREE_MASK_STATE) == wxTREE_MASK_STATE)
-    m_state = item.m_state;
-  if ((item.m_mask & wxTREE_MASK_TEXT) == wxTREE_MASK_TEXT)
-    m_text = item.m_text;
-  if ((item.m_mask & wxTREE_MASK_IMAGE) == wxTREE_MASK_IMAGE)
-    m_image = item.m_image;
-  if ((item.m_mask & wxTREE_MASK_SELECTED_IMAGE) == wxTREE_MASK_SELECTED_IMAGE)
-    m_selectedImage = item.m_selectedImage;
-  if ((item.m_mask & wxTREE_MASK_CHILDREN) == wxTREE_MASK_CHILDREN)
-    m_hasChildren = (item.m_children > 0);
-  if ((item.m_mask & wxTREE_MASK_DATA) == wxTREE_MASK_DATA)
-    m_data = item.m_data;
-  long lw = 0;
-  long lh = 0;
-  dc->GetTextExtent( m_text, &lw, &lh );
-  m_width = lw;
-  m_height = lh;
+    (*m_accept) = FALSE;
+    (*m_res) = "";
+    if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);

 }
 
 }
 

-void wxGenericTreeItem::SetText( const wxString &text, wxDC *dc )
+#define PIXELS_PER_UNIT 10
+// -----------------------------------------------------------------------------
+// wxTreeEvent
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
+  
+wxTreeEvent::wxTreeEvent( wxEventType commandType, int id )
+           : wxNotifyEvent( commandType, id )

 {
 {

-  m_text = text;
-  long lw = 0;
-  long lh = 0;
-  dc->GetTextExtent( m_text, &lw, &lh );
-  m_width = lw;
-  m_height = lh;
+  m_code = 0;
+  m_itemOld = (wxGenericTreeItem *)NULL;

 }
 
 }
 

-void wxGenericTreeItem::Reset()
+// -----------------------------------------------------------------------------
+// wxGenericTreeItem
+// -----------------------------------------------------------------------------
+
+wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
+                                     const wxString& text,
+                                     wxDC& dc,
+                                     int image, int selImage,
+                                     wxTreeItemData *data)
+                 : m_text(text)

 {
 {

-  m_itemId = -1;
-  m_state = 0;
-  m_text = "";
-  m_image = -1;
-  m_selectedImage = -1;
-//  m_children = 0;
-  m_hasChildren = FALSE;
-  m_data = 0;
-  m_x = 0;
-  m_y = 0;
-  m_height = 0;
-  m_width = 0;
-  m_xCross = 0;
-  m_yCross = 0;
+  m_image = image;
+  m_selImage = selImage;
+  m_data = data;
+  m_x = m_y = 0;
+  m_xCross = m_yCross = 0;
+

   m_level = 0;
   m_level = 0;

-  m_children.DeleteContents( TRUE );
+

   m_isCollapsed = TRUE;
   m_isCollapsed = TRUE;

-  m_parent = (wxGenericTreeItem *) NULL;
-}
+  m_hasHilight = FALSE;
+  m_hasPlus = FALSE;
+  m_isBold = FALSE;

 
 

-void wxGenericTreeItem::GetItem( wxTreeItem &item ) const
-{
-  if ((item.m_mask & wxTREE_MASK_STATE) == wxTREE_MASK_STATE)
-    item.m_state = m_state;
-  if ((item.m_mask & wxTREE_MASK_TEXT) == wxTREE_MASK_TEXT)
-    item.m_text = m_text;
-  if ((item.m_mask & wxTREE_MASK_IMAGE) == wxTREE_MASK_IMAGE)
-    item.m_image = m_image;
-  if ((item.m_mask & wxTREE_MASK_SELECTED_IMAGE) == wxTREE_MASK_SELECTED_IMAGE)
-    item.m_selectedImage = m_selectedImage;
-  if ((item.m_mask & wxTREE_MASK_CHILDREN) == wxTREE_MASK_CHILDREN)
-    item.m_children = (int)m_hasChildren;
-  if ((item.m_mask & wxTREE_MASK_DATA) == wxTREE_MASK_DATA)
-    item.m_data = m_data;
-}
+  m_parent = parent;

 
 

-bool wxGenericTreeItem::HasChildren()
-{
-  return m_hasChildren;
+  dc.GetTextExtent( m_text, &m_width, &m_height );
+  // TODO : Add the width of the image
+  // PB   : We don't know which image is shown (image, selImage)
+  //        We don't even know imageList from the treectrl this item belongs to !!!
+  // At this point m_width doesn't mean much, this can be remove !

 }
 
 }
 

-bool wxGenericTreeItem::HasPlus()
+wxGenericTreeItem::~wxGenericTreeItem()

 {
 {

-  if ( !HasChildren() )
-    return FALSE;
+  delete m_data;

 
 

-  return !IsExpanded();
+  wxASSERT_MSG( m_children.IsEmpty(),
+                _T("please call DeleteChildren() before deleting the item") );

 }
 
 }
 

-int wxGenericTreeItem::NumberOfVisibleDescendents()
+void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree)

 {
 {

-  int ret = m_children.Number();
-  wxNode *node = m_children.First();
-  while (node)
+  size_t count = m_children.Count();
+  for ( size_t n = 0; n < count; n++ )

   {
   {

-    wxGenericTreeItem *item = (wxGenericTreeItem*)node->Data();
-    ret += item->NumberOfVisibleDescendents();
-    node = node->Next();
+    wxGenericTreeItem *child = m_children[n];
+    if ( tree )
+    {
+      tree->SendDeleteEvent(child);
+    }
+
+    child->DeleteChildren(tree);
+    delete child;

   }
   }

-  return ret;
+
+  m_children.Empty();

 }
 
 }
 

-int wxGenericTreeItem::NumberOfVisibleChildren()
+void wxGenericTreeItem::SetText( const wxString &text )

 {
 {

-  return m_isCollapsed ? 0 : m_children.Number();
+  m_text = text;

 }
 
 }
 

-wxGenericTreeItem *wxGenericTreeItem::FindItem( long itemId ) const
+void wxGenericTreeItem::Reset()

 {
 {

-  if (m_itemId == itemId) return (wxGenericTreeItem*)(this);
-  wxNode *node = m_children.First();
-  while (node)
-  {
-    wxGenericTreeItem *item = (wxGenericTreeItem*)node->Data();
-    wxGenericTreeItem *res = item->FindItem( itemId );
-    if (res) return (wxGenericTreeItem*)(res);
-    node = node->Next();
-  }
-  return (wxGenericTreeItem *) NULL;
+  m_text.Empty();
+  m_image =
+  m_selImage = -1;
+  m_data = NULL;
+  m_x = m_y =
+  m_height = m_width = 0;
+  m_xCross =
+  m_yCross = 0;
+
+  m_level = 0;
+
+  DeleteChildren();
+  m_isCollapsed = TRUE;
+
+  m_parent = (wxGenericTreeItem *)NULL;

 }
 
 }
 

-void wxGenericTreeItem::AddChild( wxGenericTreeItem *child )
+size_t wxGenericTreeItem::GetChildrenCount(bool recursively) const

 {
 {

-  m_children.Append( child );
+  size_t count = m_children.Count();
+  if ( !recursively )
+    return count;
+
+  size_t total = count;
+  for ( size_t n = 0; n < count; ++n )
+  {
+    total += m_children[n]->GetChildrenCount();
+  }
+
+  return total;

 }
 
 void wxGenericTreeItem::SetCross( int x, int y )
 }
 
 void wxGenericTreeItem::SetCross( int x, int y )


@@ -196,955 +339,1688 @@ void wxGenericTreeItem::SetCross( int x, int y )
   m_yCross = y;
 }
 
   m_yCross = y;
 }
 

-void wxGenericTreeItem::GetSize( int &x, int &y )
+void wxGenericTreeItem::GetSize( int &x, int &y, const wxTreeCtrl *theTree )

 {
 {

-  if (y < m_y + 10) y = m_y +10;
+  int bottomY=m_y+theTree->GetLineHeight(this);
+  if ( y < bottomY ) y = bottomY;

   int width = m_x +  m_width;
   int width = m_x +  m_width;

-  if (width > x) x = width;
-  wxNode *node = m_children.First();
-  while (node)
+  if ( x < width ) x = width;
+
+  if (IsExpanded())

   {
   {

-    wxGenericTreeItem *item = (wxGenericTreeItem*)node->Data();
-    item->GetSize( x, y );
-    node = node->Next();
+    size_t count = m_children.Count();
+    for ( size_t n = 0; n < count; ++n )
+    {
+      m_children[n]->GetSize( x, y, theTree );
+    }

   }
 }
 
   }
 }
 

-long wxGenericTreeItem::HitTest( const wxPoint& point, int &flags )
+wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
+                                               const wxTreeCtrl *theTree,
+                                               int &flags)

 {
 {

-  if ((point.y > m_y) && (point.y < m_y+m_height))
+  if ((point.y > m_y) && (point.y < m_y + theTree->GetLineHeight(this)))

   {
   {

-    if ((point.x > m_xCross-5) &&
-        (point.x < m_xCross+5) &&
-        (point.y > m_yCross-5) &&
-        (point.y < m_yCross+5) &&
-        (m_hasChildren))
+    if (point.y<m_y+theTree->GetLineHeight(this)/2) flags|=wxTREE_HITTEST_ONITEMUPPERPART;
+    else flags|=wxTREE_HITTEST_ONITEMLOWERPART;
+
+    // FIXME why +5?
+    //  Because that is the size of the plus sign, RR
+    if ((point.x > m_xCross-5) && (point.x < m_xCross+5) &&
+        (point.y > m_yCross-5) && (point.y < m_yCross+5) &&
+        (IsExpanded() || HasPlus()))

     {
     {

-      flags = wxTREE_HITTEST_ONITEMBUTTON;
-      return m_itemId;
+      flags|=wxTREE_HITTEST_ONITEMBUTTON;
+      return this;

     }
     }

-    if ((point.x > m_x) && (point.x < m_x+m_width))
-    {
-      flags = wxTREE_HITTEST_ONITEMLABEL;
-      return m_itemId;
-    }
-    if (point.x > m_x)
+
+    if ((point.x >= m_x) && (point.x <= m_x+m_width))

     {
     {

-      flags = wxTREE_HITTEST_ONITEMRIGHT;
-      return m_itemId;
+      int image_w = -1;
+      int image_h;
+
+      // assuming every image (normal and selected ) has the same size !
+      if ((m_image!=-1) && theTree->m_imageListNormal)
+          theTree->m_imageListNormal->GetSize(m_image, image_w, image_h);
+
+      if ((image_w != -1) && (point.x <= m_x + image_w + 1))
+        flags|=wxTREE_HITTEST_ONITEMICON;
+      else
+        flags|=wxTREE_HITTEST_ONITEMLABEL;
+
+      return this;

     }
     }

-    flags = wxTREE_HITTEST_ONITEMINDENT;
-    return m_itemId;
+
+    if (point.x < m_x)         flags|=wxTREE_HITTEST_ONITEMIDENT;
+    if (point.x > m_x+m_width) flags|=wxTREE_HITTEST_ONITEMRIGHT;
+
+    return this;

   }
   else
   {
     if (!m_isCollapsed)
     {
   }
   else
   {
     if (!m_isCollapsed)
     {

-      wxNode *node = m_children.First();
-      while (node)
+      size_t count = m_children.Count();
+      for ( size_t n = 0; n < count; n++ )

       {
       {

-        wxGenericTreeItem *child = (wxGenericTreeItem*)node->Data();
-        long res = child->HitTest( point, flags );
-        if (res != -1) return res;
-        node = node->Next();
+        wxGenericTreeItem *res = m_children[n]->HitTest( point, theTree, flags );
+        if ( res != NULL )
+          return res;

       }
     }
   }
       }
     }
   }

-  return -1;
+
+  flags|=wxTREE_HITTEST_NOWHERE;
+  return NULL;
+}
+
+// -----------------------------------------------------------------------------
+// wxTreeCtrl implementation
+// -----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxScrolledWindow)
+
+BEGIN_EVENT_TABLE(wxTreeCtrl,wxScrolledWindow)
+  EVT_PAINT          (wxTreeCtrl::OnPaint)
+  EVT_MOUSE_EVENTS   (wxTreeCtrl::OnMouse)
+  EVT_CHAR           (wxTreeCtrl::OnChar)
+  EVT_SET_FOCUS      (wxTreeCtrl::OnSetFocus)
+  EVT_KILL_FOCUS     (wxTreeCtrl::OnKillFocus)
+  EVT_IDLE           (wxTreeCtrl::OnIdle)
+END_EVENT_TABLE()
+
+// -----------------------------------------------------------------------------
+// construction/destruction
+// -----------------------------------------------------------------------------
+
+void wxTreeCtrl::Init()
+{
+  m_current =
+  m_key_current =
+  m_anchor = (wxGenericTreeItem *) NULL;
+  m_hasFocus = FALSE;
+  m_dirty = FALSE;
+
+  m_xScroll = 0;
+  m_yScroll = 0;
+  m_lineHeight = 10;
+  m_indent = 15;
+  m_spacing = 18;
+
+  m_hilightBrush = new wxBrush
+    (
+      wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT),
+      wxSOLID
+    );
+
+  m_imageListNormal =
+  m_imageListState = (wxImageList *) NULL;
+
+  m_dragCount = 0;
+  
+  m_renameTimer = new wxTreeRenameTimer( this );
+}
+
+bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
+                        const wxPoint& pos, const wxSize& size,
+                        long style,
+            const wxValidator &validator,
+            const wxString& name )
+{
+  Init();
+
+  wxScrolledWindow::Create( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name );
+
+#if wxUSE_VALIDATORS
+  SetValidator( validator );
+#endif
+
+  SetBackgroundColour( *wxWHITE );
+//  m_dottedPen = wxPen( "grey", 0, wxDOT );
+  m_dottedPen = wxPen( "grey", 0, 0 );
+
+  return TRUE;

 }
 
 }
 

-void wxGenericTreeItem::PrepareEvent( wxTreeEvent &event )
+wxTreeCtrl::~wxTreeCtrl()

 {
 {

-  event.m_item.m_itemId = m_itemId;
-  event.m_item.m_state = m_state;
-  event.m_item.m_text = m_text;
-  event.m_item.m_image = m_image;
-  event.m_item.m_selectedImage = m_selectedImage;
-  event.m_item.m_children = (int)m_hasChildren;
-  event.m_item.m_data = m_data;
-  event.m_oldItem = 0;
-  event.m_code = 0;
-  event.m_pointDrag.x = 0;
-  event.m_pointDrag.y = 0;
+  wxDELETE( m_hilightBrush );
+
+  DeleteAllItems();
+  
+  delete m_renameTimer;

 }
 
 }
 

-void wxGenericTreeItem::SendKeyDown( wxWindow *target )
+// -----------------------------------------------------------------------------
+// accessors
+// -----------------------------------------------------------------------------
+
+size_t wxTreeCtrl::GetCount() const

 {
 {

-  wxTreeEvent event( wxEVT_COMMAND_TREE_KEY_DOWN, target->GetId() );
-  PrepareEvent( event );
-  event.SetEventObject( target );
-  target->ProcessEvent( event );
+  return m_anchor == NULL ? 0u : m_anchor->GetChildrenCount();

 }
 
 }
 

-void wxGenericTreeItem::SendSelected( wxWindow *target )
+void wxTreeCtrl::SetIndent(unsigned int indent)

 {
 {

-  wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGED, target->GetId() );
-  PrepareEvent( event );
-  event.SetEventObject( target );
-  target->ProcessEvent( event );
+  m_indent = indent;
+  m_dirty = TRUE;
+  Refresh();

 }
 
 }
 

-void wxGenericTreeItem::SendDelete( wxWindow *target )
+void wxTreeCtrl::SetSpacing(unsigned int spacing)

 {
 {

-  wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, target->GetId() );
-  PrepareEvent( event );
-  event.SetEventObject( target );
-  target->ProcessEvent( event );
+  m_spacing = spacing;
+  m_dirty = TRUE;
+  Refresh();

 }
 
 }
 

-void wxGenericTreeItem::SendExpand( wxWindow *target )
+size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)

 {
 {

-  m_isCollapsed = FALSE;
+  wxCHECK_MSG( item.IsOk(), 0u, _T("invalid tree item") );
+
+  return item.m_pItem->GetChildrenCount(recursively);
+}

 
 

-  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, target->GetId() );
-  event.SetEventObject( target );
-  PrepareEvent( event );
-  target->ProcessEvent( event );
+// -----------------------------------------------------------------------------
+// functions to work with tree items
+// -----------------------------------------------------------------------------

 
 

-  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
-  PrepareEvent( event );
-  target->ProcessEvent( event );
+wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), _T(""), _T("invalid tree item") );
+
+  return item.m_pItem->GetText();

 }
 
 }
 

-void wxGenericTreeItem::SendCollapse( wxWindow *target )
+int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const

 {
 {

-  m_isCollapsed = TRUE;
+  wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") );
+
+  return item.m_pItem->GetImage();
+}

 
 

-  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, target->GetId() );
-  event.SetEventObject( target );
-  PrepareEvent( event );
-  target->ProcessEvent( event );
+int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") );

 
 

-  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
-  PrepareEvent( event );
-  target->ProcessEvent( event );
+  return item.m_pItem->GetSelectedImage();

 }
 
 }
 

-void wxGenericTreeItem::SetHilight( bool set )
+wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const

 {
 {

-  m_hasHilight = set;
+  wxCHECK_MSG( item.IsOk(), NULL, _T("invalid tree item") );
+
+  return item.m_pItem->GetData();

 }
 
 }
 

-bool wxGenericTreeItem::HasHilight()
+void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)

 {
 {

-  return m_hasHilight;
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+
+  wxClientDC dc(this);
+  wxGenericTreeItem *pItem = item.m_pItem;
+  pItem->SetText(text);
+  CalculateSize(pItem, dc);
+  RefreshLine(pItem);

 }
 
 }
 

-//-----------------------------------------------------------------------------
-// wxTreeCtrl
-//-----------------------------------------------------------------------------
+void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
+{
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl,wxScrolledWindow)
+  wxClientDC dc(this);
+  wxGenericTreeItem *pItem = item.m_pItem;
+  pItem->SetImage(image);
+  CalculateSize(pItem, dc);
+  RefreshLine(pItem);
+}

 
 

-BEGIN_EVENT_TABLE(wxTreeCtrl,wxScrolledWindow)
-  EVT_PAINT          (wxTreeCtrl::OnPaint)
-  EVT_MOUSE_EVENTS   (wxTreeCtrl::OnMouse)
-  EVT_CHAR           (wxTreeCtrl::OnChar)
-  EVT_SET_FOCUS      (wxTreeCtrl::OnSetFocus)
-  EVT_KILL_FOCUS     (wxTreeCtrl::OnKillFocus)
-END_EVENT_TABLE()
+void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
+{
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+
+  wxClientDC dc(this);
+  wxGenericTreeItem *pItem = item.m_pItem;
+  pItem->SetSelectedImage(image);
+  CalculateSize(pItem, dc);
+  RefreshLine(pItem);
+}

 
 

-wxTreeCtrl::wxTreeCtrl()
+void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)

 {
 {

-  m_current = (wxGenericTreeItem *) NULL;
-  m_anchor = (wxGenericTreeItem *) NULL;
-  m_hasFocus = FALSE;
-  m_xScroll = 0;
-  m_yScroll = 0;
-  m_lastId = 0;
-  m_lineHeight = 10;
-  m_indent = 15;
-  m_isCreated = FALSE;
-  m_hilightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
-  m_imageList = (wxImageList *) NULL;
-  m_smallImageList = (wxImageList *) NULL;
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+
+  item.m_pItem->SetData(data);

 }
 
 }
 

-wxTreeCtrl::wxTreeCtrl(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos, const wxSize& size,
-            long style, const wxString& name )
+void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)

 {
 {

-  m_current = (wxGenericTreeItem *) NULL;
-  m_anchor = (wxGenericTreeItem *) NULL;
-  m_hasFocus = FALSE;
-  m_xScroll = 0;
-  m_yScroll = 0;
-  m_lastId = 0;
-  m_lineHeight = 10;
-  m_indent = 15;
-  m_isCreated = FALSE;
-  m_hilightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
-  m_imageList = (wxImageList *) NULL;
-  m_smallImageList = (wxImageList *) NULL;
-  Create( parent, id, pos, size, style, name );
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+
+  wxGenericTreeItem *pItem = item.m_pItem;
+  pItem->SetHasPlus(has);
+  RefreshLine(pItem);

 }
 
 }
 

-wxTreeCtrl::~wxTreeCtrl()
+void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)

 {
 {

-  if (m_hilightBrush) delete m_hilightBrush;
-  if (m_anchor) delete m_anchor;
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
+
+  // avoid redrawing the tree if no real change
+  wxGenericTreeItem *pItem = item.m_pItem;
+  if ( pItem->IsBold() != bold )
+  {
+    pItem->SetBold(bold);
+    RefreshLine(pItem);
+  }

 }
 
 }
 

-bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos, const wxSize& size,
-            long style, const wxString& name )
+// -----------------------------------------------------------------------------
+// item status inquiries
+// -----------------------------------------------------------------------------
+
+bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const

 {
 {

-  wxScrolledWindow::Create( parent, id, pos, size, style, name );
-  SetBackgroundColour( *wxWHITE );
-  m_dottedPen = wxPen( *wxBLACK, 0, 0 );
+  wxFAIL_MSG(_T("not implemented"));
+

   return TRUE;
 }
 
   return TRUE;
 }
 

-int wxTreeCtrl::GetCount() const
+bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const

 {
 {

-  if (!m_anchor) return 0;
-  return m_anchor->NumberOfVisibleDescendents();
+  wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
+
+  return !item.m_pItem->GetChildren().IsEmpty();

 }
 
 }
 

-long wxTreeCtrl::InsertItem( long parent, const wxString& label, int image,
-      int selImage, long WXUNUSED(insertAfter) )
+bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const

 {
 {

-  wxGenericTreeItem *p = (wxGenericTreeItem *) NULL;
-  if (parent == 0)
-  {
-    if (m_anchor) return -1;
-  }
-  else
-  {
-    p = FindItem( parent );
-    if (!p) return -1;
-  }
-  wxTreeItem item;
-  m_lastId++;
-  item.m_mask = wxTREE_MASK_HANDLE;
-  item.m_itemId = m_lastId;
-  if (!label.IsNull() || (label == ""))
-  {
-    item.m_text = label;
-    item.m_mask |= wxTREE_MASK_TEXT;
-  }
-  if (image >= 0)
-  {
-    item.m_image = image;
-    item.m_mask |= wxTREE_MASK_IMAGE;
-  }
-  if (selImage >= 0)
-  {
-    item.m_selectedImage = selImage;
-    item.m_mask |= wxTREE_MASK_SELECTED_IMAGE;
-  }
+  wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );

 
 

-  wxClientDC dc(this);
-  wxGenericTreeItem *new_child = new wxGenericTreeItem( p, item, &dc );
-  if (p)
-    p->AddChild( new_child );
-  else
-    m_anchor = new_child;
+  return item.m_pItem->IsExpanded();
+}

 
 

-  if (p)
-  {
-    CalculatePositions();
+bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );

 
 

-    if (!p->HasChildren()) p->m_hasChildren = TRUE;
+  return item.m_pItem->HasHilight();
+}

 
 

-    int ch = 0;
-    GetClientSize( (int *) NULL, &ch );
+bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );

 
 

-    PrepareDC( dc );
-    
-    wxRectangle rect;
-    rect.x = dc.LogicalToDeviceX( 0 ); 
-    rect.y = 0;
-    rect.width = 10000; 
-    rect.height = ch;
+  return item.m_pItem->IsBold();
+}

 
 

-    if (p->m_children.Number() == 1)
-    {
-      rect.y = dc.LogicalToDeviceY( p->m_y );
-    }
-    else
-    {
-      wxNode *node = p->m_children.Member( new_child )->Previous();
-      wxGenericTreeItem* last_child = (wxGenericTreeItem*)node->Data();
-      rect.y = dc.LogicalToDeviceY( last_child->m_y );
-    }
+// -----------------------------------------------------------------------------
+// navigation
+// -----------------------------------------------------------------------------

 
 

-    AdjustMyScrollbars();
+wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );

 
 

-    if (rect.height > 0) Refresh( FALSE, &rect);
-  }
-  else
-  {
-    AdjustMyScrollbars();
+  return item.m_pItem->GetParent();
+}

 
 

-    Refresh();
-  }
+wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const
+{
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );

 
 

-  return m_lastId;
+  cookie = 0;
+  return GetNextChild(item, cookie);

 }
 
 }
 

-long wxTreeCtrl::InsertItem( long parent, wxTreeItem &info, long WXUNUSED(insertAfter) )
+wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const

 {
 {

-  int oldMask = info.m_mask;
-  wxGenericTreeItem *p = (wxGenericTreeItem *) NULL;
-  if (parent == 0)
-  {
-    if (m_anchor) return -1;
-  }
-  else
-  {
-    p = FindItem( parent );
-    if (!p)
-    {
-      printf( "TreeItem not found.\n" );
-      return -1;
-    }
-  }
-  long ret = 0;
-  if ((info.m_mask & wxTREE_MASK_HANDLE) == 0)
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+
+  wxArrayGenericTreeItems& children = item.m_pItem->GetChildren();
+  if ( (size_t)cookie < children.Count() )

   {
   {

-    m_lastId++;
-    info.m_itemId = m_lastId;
-    info.m_mask |= wxTREE_MASK_HANDLE;
-    ret = m_lastId;
+    return children.Item(cookie++);

   }
   else
   {
   }
   else
   {

-    ret = info.m_itemId;
+    // there are no more of them
+    return wxTreeItemId();

   }
   }

+}

 
 

-  wxClientDC dc(this);
-  wxGenericTreeItem *new_child = new wxGenericTreeItem( p, info, &dc );
-  if (p)
-    p->AddChild( new_child );
-  else
-    m_anchor = new_child;
+wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );

 
 

-  if (p)
+  wxArrayGenericTreeItems& children = item.m_pItem->GetChildren();
+  return (children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last()));
+}
+
+wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+
+  wxGenericTreeItem *i = item.m_pItem;
+  wxGenericTreeItem *parent = i->GetParent();
+  if ( parent == NULL )

   {
   {

-    CalculatePositions();
+    // root item doesn't have any siblings
+    return wxTreeItemId();
+  }

 
 

-    if (!p->HasChildren()) p->m_hasChildren = TRUE;
+  wxArrayGenericTreeItems& siblings = parent->GetChildren();
+  int index = siblings.Index(i);
+  wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?

 
 

-    int ch = 0;
-    GetClientSize( (int *) NULL, &ch );
+  size_t n = (size_t)(index + 1);
+  return n == siblings.Count() ? wxTreeItemId() : wxTreeItemId(siblings[n]);
+}

 
 

-    PrepareDC( dc );
-    
-    wxRectangle rect;
-    rect.x = dc.LogicalToDeviceX( 0 ); 
-    rect.y = 0;
-    rect.width = 10000; 
-    rect.height = ch;
+wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );

 
 

-    if (p->m_children.Number() == 1)
-    {
-      rect.y = dc.LogicalToDeviceY( p->m_y );
-    }
-    else
-    {
-      wxNode *node = p->m_children.Member( new_child )->Previous();
-      wxGenericTreeItem* last_child = (wxGenericTreeItem*)node->Data();
-      rect.y = dc.LogicalToDeviceY( last_child->m_y );
-    }
+  wxGenericTreeItem *i = item.m_pItem;
+  wxGenericTreeItem *parent = i->GetParent();
+  if ( parent == NULL )
+  {
+    // root item doesn't have any siblings
+    return wxTreeItemId();
+  }

 
 

-    AdjustMyScrollbars();
+  wxArrayGenericTreeItems& siblings = parent->GetChildren();
+  int index = siblings.Index(i);
+  wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?

 
 

-    if (rect.height > 0) Refresh( FALSE, &rect);
-  }
-  else
-  {
-    AdjustMyScrollbars();
+  return index == 0 ? wxTreeItemId()
+                    : wxTreeItemId(siblings[(size_t)(index - 1)]);
+}

 
 

-    Refresh();
-  }
+wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
+{
+  wxFAIL_MSG(_T("not implemented"));

 
 

-  info.m_mask = oldMask;
-  return ret;
+  return wxTreeItemId();

 }
 
 }
 

-bool wxTreeCtrl::ExpandItem( long item, int action )
+wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const

 {
 {

-  wxGenericTreeItem *i = FindItem( item );
-  if (!i)
-    return FALSE;
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );

 
 

-  switch (action)
-  {
-    case wxTREE_EXPAND_EXPAND:
-    {
-      i->SendExpand( this );
-      break;
-    }
+  wxFAIL_MSG(_T("not implemented"));

 
 

-    case wxTREE_EXPAND_COLLAPSE_RESET:
-    case wxTREE_EXPAND_COLLAPSE:
-    {
-      wxNode *node = i->m_children.First();
-      while (node)
-      {
-        wxGenericTreeItem *child = (wxGenericTreeItem*)node->Data();
-        if ( child->IsExpanded() )
-          ExpandItem( child->m_itemId, wxTREE_EXPAND_COLLAPSE );
-        node = node->Next();
-      }
+  return wxTreeItemId();
+}

 
 

-      CalculatePositions();
+wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );

 
 

-      i->SendCollapse( this );
-      break;
-    }
+  wxFAIL_MSG(_T("not implemented"));

 
 

-    case wxTREE_EXPAND_TOGGLE:
-    {
-      if ( i->IsExpanded() )
-        ExpandItem( item, wxTREE_EXPAND_COLLAPSE );
-      else
-        ExpandItem( item, wxTREE_EXPAND_EXPAND );
-      return TRUE;
-    }
+  return wxTreeItemId();
+}
+
+// -----------------------------------------------------------------------------
+// operations
+// -----------------------------------------------------------------------------
+
+wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parentId,
+                                      size_t previous,
+                                      const wxString& text,
+                                      int image, int selImage,
+                                      wxTreeItemData *data)
+{
+  wxGenericTreeItem *parent = parentId.m_pItem;
+  if ( !parent )
+  {
+    // should we give a warning here?
+    return AddRoot(text, image, selImage, data);

   }
 
   wxClientDC dc(this);
   }
 
   wxClientDC dc(this);

-  PrepareDC(dc);
-  
-  int cw = 0;
-  int ch = 0;
-  GetClientSize( &cw, &ch );
-  
-  wxRect rect;
-  rect.x = dc.LogicalToDeviceX( 0 );
-  rect.width = cw;
-  rect.y = dc.LogicalToDeviceY( i->m_y );
-  rect.height = ch;
-  Refresh( TRUE, &rect );
+  wxGenericTreeItem *item = new wxGenericTreeItem(parent,
+                                                  text, dc,
+                                                  image, selImage,
+                                                  data);

 
 

-  AdjustMyScrollbars();
+  if ( data != NULL )
+  {
+    data->m_pItem = item;
+  }

 
 

-  return TRUE;
+  parent->Insert( item, previous );
+
+  m_dirty = TRUE;
+
+  return item;

 }
 
 }
 

-void wxTreeCtrl::DeleteItem( long item )
+wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
+                                 int image, int selImage,
+                                 wxTreeItemData *data)

 {
 {

-  wxGenericTreeItem *pItem = FindItem( item );
-  wxCHECK_RET( pItem != NULL, _("wxTreeCtrl::DeleteItem: no such pItem.") );
+  wxCHECK_MSG( !m_anchor, wxTreeItemId(), _T("tree can have only one root") );

 
 

-  pItem->m_parent->m_children.DeleteObject(pItem);
+  wxClientDC dc(this);
+  m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc,
+                                   image, selImage, data);
+  if ( data != NULL )
+  {
+    data->m_pItem = m_anchor;
+  }

 
   Refresh();
 
   Refresh();

+  AdjustMyScrollbars();
+
+  return m_anchor;

 }
 
 }
 

-void wxTreeCtrl::DeleteChildren( long item )
+wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent,
+                                     const wxString& text,
+                                     int image, int selImage,
+                                     wxTreeItemData *data)

 {
 {

-  wxGenericTreeItem *pItem = FindItem( item );
-  wxCHECK_RET( pItem != NULL, _("wxTreeCtrl::DeleteChildren: no such pItem.") );
+  return DoInsertItem(parent, 0u, text, image, selImage, data);
+}

 
 

-  pItem->m_children.Clear();
+wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parentId,
+                                    const wxTreeItemId& idPrevious,
+                                    const wxString& text,
+                                    int image, int selImage,
+                                    wxTreeItemData *data)
+{
+  wxGenericTreeItem *parent = parentId.m_pItem;
+  if ( !parent )
+  {
+    // should we give a warning here?
+    return AddRoot(text, image, selImage, data);
+  }

 
 

-  Refresh();
+  int index = parent->GetChildren().Index(idPrevious.m_pItem);
+  wxASSERT_MSG( index != wxNOT_FOUND,
+                _T("previous item in wxTreeCtrl::InsertItem() is not a sibling") );
+  return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);

 }
 
 }
 

-bool wxTreeCtrl::DeleteAllItems()
+wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parentId,
+                                    const wxString& text,
+                                    int image, int selImage,
+                                    wxTreeItemData *data)

 {
 {

-  delete m_anchor;
-  m_anchor = (wxGenericTreeItem *) NULL;
-  Refresh();
-  return TRUE;
+  wxGenericTreeItem *parent = parentId.m_pItem;
+  if ( !parent )
+  {
+    // should we give a warning here?
+    return AddRoot(text, image, selImage, data);
+  }
+
+  return DoInsertItem(parent, parent->GetChildren().Count(), text,
+                      image, selImage, data);

 }
 
 }
 

-bool wxTreeCtrl::GetItem( wxTreeItem &info ) const
+void wxTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)

 {
 {

-  wxGenericTreeItem *i = FindItem( info.m_itemId );
-  if (!i) return FALSE;
-  i->GetItem( info );
-  return TRUE;
+  wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, GetId() );
+  event.m_item = item;
+  event.SetEventObject( this );
+  ProcessEvent( event );

 }
 
 }
 

-long wxTreeCtrl::GetItemData( long item ) const
+void wxTreeCtrl::DeleteChildren(const wxTreeItemId& itemId)

 {
 {

-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return 0;
-  return i->m_data;
+    wxGenericTreeItem *item = itemId.m_pItem;
+    item->DeleteChildren(this);
+
+    m_dirty = TRUE;

 }
 
 }
 

-wxString wxTreeCtrl::GetItemText( long item ) const
+void wxTreeCtrl::Delete(const wxTreeItemId& itemId)

 {
 {

-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return "";
-  return i->m_text;
+  wxGenericTreeItem *item = itemId.m_pItem;
+  wxGenericTreeItem *parent = item->GetParent();
+
+  if ( parent )
+  {
+    parent->GetChildren().Remove(item);
+  }
+
+  item->DeleteChildren(this);
+  SendDeleteEvent(item);
+  delete item;
+
+  m_dirty = TRUE;

 }
 
 }
 

-int wxTreeCtrl::GetItemImage(long item) const
+void wxTreeCtrl::DeleteAllItems()

 {
 {

-  wxGenericTreeItem *i = FindItem( item );
-  return i == 0 ? -1 : i->GetImage();
+  if ( m_anchor )
+  {
+    m_anchor->DeleteChildren(this);
+    delete m_anchor;
+
+    m_anchor = NULL;
+
+    m_dirty = TRUE;
+  }

 }
 
 }
 

-long wxTreeCtrl::GetParent( long item ) const
+void wxTreeCtrl::Expand(const wxTreeItemId& itemId)

 {
 {

-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return -1;
-  i = i->m_parent;
-  if (!i) return -1;
-  return i->m_parent->m_itemId;
+  wxGenericTreeItem *item = itemId.m_pItem;
+
+  if ( !item->HasPlus() )
+    return;
+
+  if ( item->IsExpanded() )
+    return;
+
+  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() );
+  event.m_item = item;
+  event.SetEventObject( this );
+  if ( ProcessEvent( event ) && event.m_code )
+  {
+    // cancelled by program
+    return;
+  }
+
+  item->Expand();
+  CalculatePositions();
+
+  RefreshSubtree(item);
+
+  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
+  ProcessEvent( event );

 }
 
 }
 

-long wxTreeCtrl::GetRootItem() const
+void wxTreeCtrl::Collapse(const wxTreeItemId& itemId)

 {
 {

-  if (m_anchor) return m_anchor->m_itemId;
-  return -1;
+  wxGenericTreeItem *item = itemId.m_pItem;
+
+  if ( !item->IsExpanded() )
+    return;
+
+  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() );
+  event.m_item = item;
+  event.SetEventObject( this );
+  if ( ProcessEvent( event ) && event.m_code )
+  {
+    // cancelled by program
+    return;
+  }
+
+  item->Collapse();
+
+  wxArrayGenericTreeItems& children = item->GetChildren();
+  size_t count = children.Count();
+  for ( size_t n = 0; n < count; n++ )
+  {
+    Collapse(children[n]);
+  }
+
+  CalculatePositions();
+
+  RefreshSubtree(item);
+
+  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
+  ProcessEvent( event );

 }
 
 }
 

-long wxTreeCtrl::GetChild( long item ) const
+void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item)

 {
 {

-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return -1;
-  if (!i->HasChildren()) return -1;
-  wxNode *node = i->m_children.First();
-  i = (wxGenericTreeItem *)node->Data();
-  return i->m_itemId;
+  Collapse(item);
+  DeleteChildren(item);

 }
 
 }
 

-long wxTreeCtrl::GetNextItem( long item, int code ) const
+void wxTreeCtrl::Toggle(const wxTreeItemId& itemId)

 {
 {

-  switch (code)
+  wxGenericTreeItem *item = itemId.m_pItem;
+
+  if ( item->IsExpanded() )
+    Collapse(itemId);
+  else
+    Expand(itemId);
+}
+
+void wxTreeCtrl::Unselect()
+{
+  if ( m_current )

   {
   {

-    case wxTREE_NEXT_CARET:  return GetSelection();
-    case wxTREE_NEXT_CHILD:  return GetChild( item );
-    case wxTREE_NEXT_ROOT:   return GetRootItem();
-    case wxTREE_NEXT_PARENT: return GetParent( item );
-    case wxTREE_NEXT_NEXT:
+    m_current->SetHilight( FALSE );
+    RefreshLine( m_current );
+  }
+}
+
+void wxTreeCtrl::UnselectAllChildren(wxGenericTreeItem *item)
+{
+  item->SetHilight(FALSE);
+  RefreshLine(item);
+
+  if (item->HasChildren())

     {
     {

-      wxGenericTreeItem *i = FindItem( item );
-      if (!i) return -1;
-      if (i->m_parent)
-      {
-        wxNode *node = i->m_parent->m_children.Member( i );
-       if (!node) return -1;
-       node = node->Next();
-       if (!node) return -1;
-        i = (wxGenericTreeItem *)node->Data();
-        return i->m_itemId;
-      }
-      break;
+      wxArrayGenericTreeItems& children = item->GetChildren();
+      size_t count = children.Count();
+      for ( size_t n = 0; n < count; ++n )
+        UnselectAllChildren(children[n]);

     }
     }

-    case wxTREE_NEXT_PREVIOUS:
-    {
-      wxGenericTreeItem *i = FindItem( item );
-      if (!i) return -1;
-      if (i->m_parent)
-      {
-        wxNode *node = i->m_parent->m_children.Member( i );
-       if (!node) return -1;
-       node = node->Previous();
-       if (!node) return -1;
-        i = (wxGenericTreeItem *)node->Data();
-        return i->m_itemId;
-      }
-      break;
-    }
-  }
-  return -1;

 }
 
 }
 

-long wxTreeCtrl::GetSelection() const
+void wxTreeCtrl::UnselectAll()

 {
 {

-  return m_current ? m_current->GetItemId() : -1;
+  UnselectAllChildren(GetRootItem().m_pItem);

 }
 
 }
 

-bool wxTreeCtrl::SelectItem( long itemId )
+// Recursive function !
+// To stop we must have crt_item<last_item
+// Algorithm :
+// Tag all next children, when no more children,
+// Move to parent (not to tag)
+// Keep going... if we found last_item, we stop.
+bool wxTreeCtrl::TagNextChildren(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select)

 {
 {

-  wxGenericTreeItem *pItem = FindItem(itemId);
-  if ( !pItem ) {
-    wxLogDebug(_("Can't select an item %d which doesn't exist."), itemId);
+    wxGenericTreeItem *parent = crt_item->GetParent();

 
 

-    return FALSE;
-  }
+    if ( parent == NULL ) // This is root item
+      return TagAllChildrenUntilLast(crt_item, last_item, select);

 
 

-  SelectItem(pItem);
+    wxArrayGenericTreeItems& children = parent->GetChildren();
+    int index = children.Index(crt_item);
+    wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?

 
 

-  return TRUE;
+    size_t count = children.Count();
+    for (size_t n=(size_t)(index+1); n<count; ++n)
+      if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE;
+
+    return TagNextChildren(parent, last_item, select);

 }
 
 }
 

-void wxTreeCtrl::SelectItem(wxGenericTreeItem *item)
+bool wxTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select)

 {
 {

-  if (m_current != item)
-  {
-    if (m_current)
+  crt_item->SetHilight(select);
+  RefreshLine(crt_item);
+
+  if (crt_item==last_item) return TRUE;
+
+  if (crt_item->HasChildren())

     {
     {

-      m_current->SetHilight( FALSE );
-      RefreshLine( m_current );
+      wxArrayGenericTreeItems& children = crt_item->GetChildren();
+      size_t count = children.Count();
+      for ( size_t n = 0; n < count; ++n )
+        if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE;

     }
     }

-    m_current = item;
-    m_current->SetHilight( TRUE );
-    RefreshLine( m_current );

 
 

-    m_current->SendSelected( this );
-  }
+  return FALSE;

 }
 
 }
 

-bool wxTreeCtrl::ItemHasChildren( long item ) const
+void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *item2)

 {
 {

-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return FALSE;
-  return i->m_hasChildren;
+  // item2 is not necessary after item1
+  wxGenericTreeItem *first=NULL, *last=NULL;
+
+  // choice first' and 'last' between item1 and item2
+  if (item1->GetY()<item2->GetY())
+    {
+      first=item1;
+      last=item2;
+    }
+  else
+    {
+      first=item2;
+      last=item1;
+    }
+
+  bool select=m_current->HasHilight();
+
+  if (TagAllChildrenUntilLast(first,last,select)) return;
+
+  TagNextChildren(first,last,select);

 }
 
 }
 

-void wxTreeCtrl::SetIndent( int indent )
+void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
+                            bool unselect_others,
+                            bool extended_select)

 {
 {

-  m_indent = indent;
-  Refresh();
+    wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") );
+
+    bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE);
+
+    //wxCHECK_RET( ( (!unselect_others) && is_single),
+    //           _T("this is a single selection tree") );
+
+    // to keep going anyhow !!!
+    if (is_single)
+    {
+        unselect_others=TRUE;
+        extended_select=FALSE;
+    }
+
+    wxGenericTreeItem *item = itemId.m_pItem;
+
+    wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() );
+    event.m_item = item;
+    event.m_itemOld = m_current;
+    event.SetEventObject( this );
+    // TODO : Here we don't send any selection mode yet !
+
+    if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
+      return;
+
+    // ctrl press
+    if (unselect_others)
+    {
+        if (is_single) Unselect(); // to speed up thing
+        else UnselectAll();
+    }
+
+    // shift press
+    if (extended_select)
+    {
+        if (m_current == NULL) m_current=m_key_current=GetRootItem().m_pItem;
+        // don't change the mark (m_current)
+        SelectItemRange(m_current, item);
+    }
+    else
+    {
+        bool select=TRUE; // the default
+
+        // Check if we need to toggle hilight (ctrl mode)
+        if (!unselect_others)
+          select=!item->HasHilight();
+
+        m_current = m_key_current = item;
+        m_current->SetHilight(select);
+        RefreshLine( m_current );
+    }
+
+    event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
+    GetEventHandler()->ProcessEvent( event );

 }
 
 }
 

-int wxTreeCtrl::GetIndent() const
+void wxTreeCtrl::FillArray(wxGenericTreeItem *item, wxArrayTreeItemIds &array) const

 {
 {

-  return m_indent;
+  if (item->HasHilight()) array.Add(wxTreeItemId(item));
+
+  if (item->HasChildren())
+    {
+      wxArrayGenericTreeItems& children = item->GetChildren();
+      size_t count = children.Count();
+      for ( size_t n = 0; n < count; ++n )
+        FillArray(children[n],array);
+    }

 }
 
 }
 

-bool wxTreeCtrl::SetItem( wxTreeItem &info )
+size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds &array) const

 {
 {

-  wxGenericTreeItem *i = FindItem( info.m_itemId );
-  if (!i) return FALSE;
-  wxClientDC dc(this);
-  i->SetItem( info, &dc );
-  Refresh();
-  return TRUE;
+  array.Empty();
+  FillArray(GetRootItem().m_pItem, array);
+
+  return array.Count();

 }
 
 }
 

-bool wxTreeCtrl::SetItemData( long item, long data )
+void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)

 {
 {

-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return FALSE;
-  i->m_data = data;
-  return TRUE;
+    if (!item.IsOk()) return;
+
+    wxGenericTreeItem *gitem = item.m_pItem;
+
+    // first expand all parent branches
+    wxGenericTreeItem *parent = gitem->GetParent();
+    while ( parent && !parent->IsExpanded() )
+    {
+        Expand(parent);
+
+        parent = parent->GetParent();
+    }
+
+    if (parent) CalculatePositions();
+
+    ScrollTo(item);

 }
 
 }
 

-bool wxTreeCtrl::SetItemText( long item, const wxString &text )
+void wxTreeCtrl::ScrollTo(const wxTreeItemId &item)

 {
 {

-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return FALSE;
-  wxClientDC dc(this);
-  i->SetText( text, &dc );
-  return TRUE;
+    if (!item.IsOk()) return;
+
+    wxGenericTreeItem *gitem = item.m_pItem;
+
+    // now scroll to the item
+    int item_y = gitem->GetY();
+
+    int start_x = 0;
+    int start_y = 0;
+    ViewStart( &start_x, &start_y );
+    start_y *= PIXELS_PER_UNIT;
+
+    int client_h = 0;
+    int client_w = 0;
+    GetClientSize( &client_w, &client_h );
+
+    if (item_y < start_y+3)
+    {
+        // going down
+        int x = 0;
+        int y = 0;
+        m_anchor->GetSize( x, y, this );
+        y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+        int x_pos = GetScrollPos( wxHORIZONTAL );
+        // Item should appear at top
+        SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, item_y/PIXELS_PER_UNIT );
+    }
+    else if (item_y+GetLineHeight(gitem) > start_y+client_h)
+    {
+       // going up
+       int x = 0;
+       int y = 0;
+       m_anchor->GetSize( x, y, this );
+       y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+       item_y += PIXELS_PER_UNIT+2;
+       int x_pos = GetScrollPos( wxHORIZONTAL );
+        // Item should appear at bottom
+       SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, (item_y+GetLineHeight(gitem)-client_h)/PIXELS_PER_UNIT );
+    }

 }
 
 }
 

-void wxTreeCtrl::SetItemImage(long item, int image, int imageSel) const
+// FIXME: tree sorting functions are not reentrant and not MT-safe!
+static wxTreeCtrl *s_treeBeingSorted = NULL;
+
+static int tree_ctrl_compare_func(wxGenericTreeItem **item1,
+                                  wxGenericTreeItem **item2)

 {
 {

-  wxGenericTreeItem *i = FindItem( item );
-  if ( i != 0 ) 
-  {
-    i->SetImage(image);
-    i->SetSelectedImage(imageSel);
-  }
+    wxCHECK_MSG( s_treeBeingSorted, 0, _T("bug in wxTreeCtrl::SortChildren()") );
+
+    return s_treeBeingSorted->OnCompareItems(*item1, *item2);

 }
 
 }
 

-int wxTreeCtrl::GetItemState( long item, long stateMask ) const
+int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
+                               const wxTreeItemId& item2)

 {
 {

-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return 0;
-  int ret = 0;
-  
-  // Currently, an item is always selected _and_ focussed in wxGTK
-  
-  if (stateMask & wxTREE_STATE_FOCUSED)
-    if (m_current == i) 
-      ret += wxTREE_STATE_FOCUSED;
-    
-  if (stateMask & wxTREE_STATE_SELECTED)
-    if (m_current == i) 
-      ret += wxTREE_STATE_SELECTED;
-      
-  if (stateMask & wxTREE_STATE_EXPANDED)
-    if (i->IsExpanded()) 
-      ret += wxTREE_STATE_EXPANDED;
-      
-  return ret;
+    return wxStrcmp(GetItemText(item1), GetItemText(item2));

 }
 
 }
 

-bool wxTreeCtrl::SetItemState( long item, long state, long stateMask )
+void wxTreeCtrl::SortChildren(const wxTreeItemId& itemId)

 {
 {

-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return FALSE;
-  
-  if (stateMask & wxTREE_STATE_FOCUSED)
-  {
-    if (state & wxTREE_STATE_FOCUSED)
-      SelectItem( i );
-  }
-    
-  if (stateMask & wxTREE_STATE_SELECTED)
-  {
-    if (state & wxTREE_STATE_SELECTED)
-      SelectItem( i );
-  }
-      
-  if (stateMask & wxTREE_STATE_EXPANDED)
-  {
-    if (state & wxTREE_STATE_EXPANDED)
-      ExpandItem( i->m_itemId, wxTREE_EXPAND_EXPAND );
-    else
-      ExpandItem( i->m_itemId, wxTREE_EXPAND_COLLAPSE );
-  }
-  
-  return TRUE;
+    wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") );
+
+    wxGenericTreeItem *item = itemId.m_pItem;
+
+    wxCHECK_RET( !s_treeBeingSorted,
+                 _T("wxTreeCtrl::SortChildren is not reentrant") );
+
+    wxArrayGenericTreeItems& children = item->GetChildren();
+    if ( children.Count() > 1 )
+    {
+        s_treeBeingSorted = this;
+        children.Sort(tree_ctrl_compare_func);
+        s_treeBeingSorted = NULL;
+
+        m_dirty = TRUE;
+    }
+    //else: don't make the tree dirty as nothing changed

 }
 
 }
 

-long wxTreeCtrl::HitTest( const wxPoint& point, int &flags )
+wxImageList *wxTreeCtrl::GetImageList() const

 {
 {

-  flags = 0;
-  if (!m_anchor) return -1;
-  return m_anchor->HitTest( point, flags );
+    return m_imageListNormal;

 }
 
 }
 

-wxImageList *wxTreeCtrl::GetImageList( int which ) const
+wxImageList *wxTreeCtrl::GetStateImageList() const

 {
 {

-  if (which == wxIMAGE_LIST_NORMAL) return m_imageList;
-  return m_smallImageList;
+    return m_imageListState;

 }
 
 }
 

-void wxTreeCtrl::SetImageList( wxImageList *imageList, int which )
+void wxTreeCtrl::SetImageList(wxImageList *imageList)

 {
 {

-  if (which == wxIMAGE_LIST_NORMAL)
-  {
-    if (m_imageList) delete m_imageList;
-    m_imageList = imageList;
-  }
-  else
-  {
-    if (m_smallImageList) delete m_smallImageList;
-    m_smallImageList = imageList;
-  }
+   m_imageListNormal = imageList;
+
+   // Calculate a m_lineHeight value from the image sizes.
+   // May be toggle off. Then wxTreeCtrl will spread when
+   // necessary (which might look ugly).
+#if 1
+   wxPaintDC dc(this);
+   m_lineHeight = (int)(dc.GetCharHeight() + 4);
+   int
+      width = 0,
+      height = 0,
+      n = m_imageListNormal->GetImageCount();
+   for(int i = 0; i < n ; i++)
+   {
+      m_imageListNormal->GetSize(i, width, height);
+      if(height > m_lineHeight) m_lineHeight = height;
+   }
+
+   if (m_lineHeight<40) m_lineHeight+=4; // at least 4 pixels (odd such that a line can be drawn in between)
+   else m_lineHeight+=m_lineHeight/10;   // otherwise 10% extra spacing
+
+#endif

 }
 
 }
 

+void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
+{
+    m_imageListState = imageList;
+}
+
+// -----------------------------------------------------------------------------
+// helpers
+// -----------------------------------------------------------------------------
+

 void wxTreeCtrl::AdjustMyScrollbars()
 {
 void wxTreeCtrl::AdjustMyScrollbars()
 {

-  if (m_anchor)
-  {
-    int x = 0;
-    int y = 0;
-    m_anchor->GetSize( x, y );
-    y += 2*m_lineHeight;
-    int x_pos = GetScrollPos( wxHORIZONTAL );
-    int y_pos = GetScrollPos( wxVERTICAL );
-    SetScrollbars( 10, 10, x/10, y/10, x_pos, y_pos );
-  }
+    if (m_anchor)
+    {
+        int x = 0;
+        int y = 0;
+        m_anchor->GetSize( x, y, this );
+        //y += GetLineHeight(m_anchor);
+        y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+        int x_pos = GetScrollPos( wxHORIZONTAL );
+        int y_pos = GetScrollPos( wxVERTICAL );
+        SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, y_pos );
+    }
+    else
+    {
+        SetScrollbars( 0, 0, 0, 0 );
+    }
+}
+
+int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const
+{
+  if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT)
+    return item->GetHeight();

   else
   else

-  {
-    SetScrollbars( 0, 0, 0, 0 );
-  }
+    return m_lineHeight;

 }
 
 }
 

-void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
+void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)

 {
 {

-  int horizX = level*m_indent;
+    // render bold items in bold
+    wxFont fontOld;
+    wxFont fontNew;

 
 

-  item->m_x = horizX+33;
-  item->m_y = y-m_lineHeight/3;
-  item->m_height = m_lineHeight;
+    if (item->IsBold())
+    {
+        fontOld = dc.GetFont();
+        if (fontOld.Ok())
+        {
+          // VZ: is there any better way to make a bold variant of old font?
+          fontNew = wxFont( fontOld.GetPointSize(),
+                            fontOld.GetFamily(),
+                            fontOld.GetStyle(),
+                            wxBOLD,
+                            fontOld.GetUnderlined());
+          dc.SetFont(fontNew);
+        }
+        else
+        {
+            wxFAIL_MSG(_T("wxDC::GetFont() failed!"));
+        }
+    }

 
 

-  item->SetCross( horizX+15, y );
+    long text_w = 0;
+    long text_h = 0;
+    dc.GetTextExtent( item->GetText(), &text_w, &text_h );

 
 

-  int oldY = y;
+    int image_h = 0;
+    int image_w = 0;
+    if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
+    {
+        m_imageListNormal->GetSize( item->GetSelectedImage(), image_w, image_h );
+        image_w += 4;
+    }
+    else if (item->GetImage() != -1)
+    {
+        m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );
+        image_w += 4;
+    }

 
 

-  int exposed_x = dc.LogicalToDeviceX( 0 );
-  int exposed_y = dc.LogicalToDeviceY( item->m_y-2 );
-  
-  if (IsExposed( exposed_x, exposed_y, 1000, m_lineHeight+4 ))
-  {
-    int startX = horizX;
-    int endX = horizX + 10;
+    int total_h = GetLineHeight(item);

 
 

-    if (!item->HasChildren()) endX += 20;
-    
-    dc.DrawLine( startX, y, endX, y );
+    dc.DrawRectangle( item->GetX()-2, item->GetY(), item->GetWidth()+2, total_h );
+
+    if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
+    {
+        dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h );
+        m_imageListNormal->Draw( item->GetSelectedImage(), dc,
+                                 item->GetX(),
+                                 item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0),
+                                 wxIMAGELIST_DRAW_TRANSPARENT );
+        dc.DestroyClippingRegion();
+    }
+    else if (item->GetImage() != -1)
+    {
+        dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h );
+        m_imageListNormal->Draw( item->GetImage(), dc,
+                                 item->GetX(),
+                                 item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0),
+                                 wxIMAGELIST_DRAW_TRANSPARENT );
+        dc.DestroyClippingRegion();
+    }
+
+    dc.SetBackgroundMode(wxTRANSPARENT);
+    dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY()
+                 + ((total_h > text_h) ? (total_h - text_h)/2 : 0));
+
+    // restore normal font for bold items
+    if (fontOld.Ok())
+    {
+        dc.SetFont( fontOld);
+    }
+}
+
+// Now y stands for the top of the item, whereas it used to stand for middle !
+void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
+{
+    int horizX = level*m_indent;
+
+    item->SetX( horizX+m_indent+m_spacing );
+    item->SetY( y );
+
+    int oldY = y;
+    y+=GetLineHeight(item)/2;
+
+    item->SetCross( horizX+m_indent, y );
+
+    int exposed_x = dc.LogicalToDeviceX( 0 );
+    int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 );
+
+    if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item)+4 ))  // 10000 = very much
+    {
+        int startX = horizX;
+        int endX = horizX + (m_indent-5);
+
+//        if (!item->HasChildren()) endX += (m_indent+5);
+        if (!item->HasChildren()) endX += 20;
+
+        dc.DrawLine( startX, y, endX, y );

 
 

-      if (item->HasChildren())
-      {
-        dc.DrawLine( horizX+20, y, horizX+30, y );
-        dc.SetPen( *wxGREY_PEN );
-        dc.DrawRectangle( horizX+10, y-4, 11, 9 );
-        dc.SetPen( *wxBLACK_PEN );
-        dc.DrawLine( horizX+13, y, horizX+18, y );

         if (item->HasPlus())
         if (item->HasPlus())

-          dc.DrawLine( horizX+15, y-2, horizX+15, y+3 );
-      }
+        {
+            dc.DrawLine( horizX+(m_indent+5), y, horizX+(m_indent+15), y );
+            dc.SetPen( *wxGREY_PEN );
+            dc.SetBrush( *wxWHITE_BRUSH );
+            dc.DrawRectangle( horizX+(m_indent-5), y-4, 11, 9 );
+            
+            dc.SetPen( *wxBLACK_PEN );
+            dc.DrawLine( horizX+(m_indent-2), y, horizX+(m_indent+3), y );
+            if (!item->IsExpanded())
+                dc.DrawLine( horizX+m_indent, y-2, horizX+m_indent, y+3 );
+                
+            dc.SetPen( m_dottedPen );
+        }

 
 

-      if (item->HasHilight())
-      {
-        dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
-        dc.SetBrush( *m_hilightBrush );
-        long tw, th;
-        dc.GetTextExtent( item->m_text, &tw, &th );
-        if (m_hasFocus)
+        if (item->HasHilight())

         {
         {

-          dc.SetPen( *wxBLACK_PEN );
-          dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
+            dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
+
+            dc.SetBrush( *m_hilightBrush );
+
+            if (m_hasFocus)
+                dc.SetPen( *wxBLACK_PEN );
+            else
+                dc.SetPen( *wxTRANSPARENT_PEN );
+
+            PaintItem(item, dc);
+
+            dc.SetPen( m_dottedPen );
+            dc.SetTextForeground( *wxBLACK );
+            dc.SetBrush( *wxWHITE_BRUSH );

         }
         else
         {
         }
         else
         {

-          dc.SetPen( *wxTRANSPARENT_PEN );
-          dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
+            dc.SetBrush( *wxWHITE_BRUSH );
+            dc.SetPen( *wxTRANSPARENT_PEN );
+
+            PaintItem(item, dc);
+
+            dc.SetPen( m_dottedPen );

         }
         }

-        dc.DrawText( item->m_text, item->m_x, item->m_y );
+    }

 
 

-        dc.SetPen( *wxBLACK_PEN );
-        dc.SetTextForeground( *wxBLACK );
-        dc.SetBrush( *wxWHITE_BRUSH );
-      }
-      else
-      {
-        dc.SetBrush( *wxWHITE_BRUSH );
-        dc.SetPen( *wxTRANSPARENT_PEN );
-        long tw, th;
-        dc.GetTextExtent( item->m_text, &tw, &th );
-        dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
-        dc.DrawText( item->m_text, item->m_x, item->m_y );
-        dc.SetPen( *wxBLACK_PEN );
-      }
-  }
+    y = oldY+GetLineHeight(item);

 
 

-  if (item->NumberOfVisibleChildren() == 0) return;
+    if (item->IsExpanded())
+    {
+        oldY+=GetLineHeight(item)/2;
+        int semiOldY=y; // (=y) for stupid compilator

 
 

-  int semiOldY = y;
+        wxArrayGenericTreeItems& children = item->GetChildren();
+        size_t n, count = children.Count();
+        for ( n = 0; n < count; ++n )
+        {
+            semiOldY=y;
+            PaintLevel( children[n], dc, level+1, y );
+        }

 
 

-  wxNode *node = item->m_children.First();
-  while (node)
-  {
-    wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();
+        // it may happen that the item is expanded but has no items (when you
+        // delete all its children for example) - don't draw the vertical line
+        // in this case
+        if (count > 0)
+          {
+            semiOldY+=GetLineHeight(children[--n])/2;
+            dc.DrawLine( horizX+m_indent, oldY+5, horizX+m_indent, semiOldY );
+          }
+    }
+}

 
 

-    y += m_lineHeight;
-    semiOldY = y;
+void wxTreeCtrl::DrawBorder(wxTreeItemId &item)
+{
+  if (!item) return;

 
 

-    PaintLevel( child, dc, level+1, y );
+    wxGenericTreeItem *i=item.m_pItem;

 
 

-    node = node->Next();
-  }
+    wxPaintDC dc(this);
+    PrepareDC( dc );
+    dc.SetLogicalFunction(wxINVERT);
+
+    int w,h,x;
+    ViewStart(&x,&h);     // we only need x
+    GetClientSize(&w,&h); // we only need w

 
 

-  dc.DrawLine( horizX+15, oldY+5, horizX+15, semiOldY );
+    h=GetLineHeight(i)+1;
+    // 2 white column at border
+    dc.DrawRectangle( PIXELS_PER_UNIT*x+2, i->GetY()-1, w-6, h);

 }
 
 }
 

-void wxTreeCtrl::OnPaint( const wxPaintEvent &WXUNUSED(event) )
+void wxTreeCtrl::DrawLine(wxTreeItemId &item, bool below)

 {
 {

-  if (!m_anchor) return;
+  if (!item) return;

 
 

-  wxPaintDC dc(this);
-  PrepareDC( dc );
+    wxGenericTreeItem *i=item.m_pItem;

 
 

-  dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_SYSTEM_FONT ) );
+    wxPaintDC dc(this);
+    PrepareDC( dc );
+    dc.SetLogicalFunction(wxINVERT);
+
+    int w,h,y;
+    GetSize(&w,&h);

 
 

-  dc.SetPen( m_dottedPen );
-  m_lineHeight = (int)(dc.GetCharHeight() + 4);
+    if (below) y=i->GetY()+GetLineHeight(i)-1;
+    else y=i->GetY();

 
 

-  int y = m_lineHeight / 2 + 2;
-  PaintLevel( m_anchor, dc, 0, y );
+    dc.DrawLine( 0, y, w, y);

 }
 
 }
 

-void wxTreeCtrl::OnSetFocus( const wxFocusEvent &WXUNUSED(event) )
+// -----------------------------------------------------------------------------
+// wxWindows callbacks
+// -----------------------------------------------------------------------------
+
+void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) )

 {
 {

-  m_hasFocus = TRUE;
-  if (m_current) RefreshLine( m_current );
+    if ( !m_anchor)
+        return;
+
+    wxPaintDC dc(this);
+    PrepareDC( dc );
+
+    dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) );
+
+    dc.SetPen( m_dottedPen );
+    //if(GetImageList() == NULL)
+    // m_lineHeight = (int)(dc.GetCharHeight() + 4);
+
+    int y = 2;
+    PaintLevel( m_anchor, dc, 0, y );

 }
 
 }
 

-void wxTreeCtrl::OnKillFocus( const wxFocusEvent &WXUNUSED(event) )
+void wxTreeCtrl::OnSetFocus( wxFocusEvent &WXUNUSED(event) )

 {
 {

-  m_hasFocus = FALSE;
-  if (m_current) RefreshLine( m_current );
+    m_hasFocus = TRUE;
+
+    if (m_current) RefreshLine( m_current );
+}
+
+void wxTreeCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
+{
+    m_hasFocus = FALSE;
+
+    if (m_current) RefreshLine( m_current );

 }
 
 void wxTreeCtrl::OnChar( wxKeyEvent &event )
 {
 }
 
 void wxTreeCtrl::OnChar( wxKeyEvent &event )
 {

-  event.Skip();
+    wxTreeEvent te( wxEVT_COMMAND_TREE_KEY_DOWN, GetId() );
+    te.m_code = event.KeyCode();
+    te.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( te );
+
+    if ( (m_current == 0) || (m_key_current == 0) )
+    {
+        event.Skip();
+        return;
+    }
+
+    bool is_multiple=(GetWindowStyleFlag() & wxTR_MULTIPLE);
+    bool extended_select=(event.ShiftDown() && is_multiple);
+    bool unselect_others=!(extended_select || (event.ControlDown() && is_multiple));
+
+    switch (event.KeyCode())
+    {
+        case '+':
+        case WXK_ADD:
+            if (m_current->HasPlus() && !IsExpanded(m_current))
+            {
+                Expand(m_current);
+            }
+            break;
+
+        case '-':
+        case WXK_SUBTRACT:
+            if (IsExpanded(m_current))
+            {
+                Collapse(m_current);
+            }
+            break;
+
+        case '*':
+        case WXK_MULTIPLY:
+            Toggle(m_current);
+            break;
+
+        case ' ':
+        case WXK_RETURN:
+            {
+                wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
+                event.m_item = m_current;
+                event.m_code = 0;
+                event.SetEventObject( this );
+                GetEventHandler()->ProcessEvent( event );
+            }
+            break;
+
+            // up goes to the previous sibling or to the last of its children if
+            // it's expanded
+        case WXK_UP:
+            {
+                wxTreeItemId prev = GetPrevSibling( m_key_current );
+                if (!prev)
+                {
+                    prev = GetParent( m_key_current );
+                    if (prev)
+                    {
+                        long cockie = 0;
+                        wxTreeItemId current = m_key_current;
+                        if (current == GetFirstChild( prev, cockie ))
+                        {
+                            // otherwise we return to where we came from
+                            SelectItem( prev, unselect_others, extended_select );
+                            m_key_current=prev.m_pItem;
+                            EnsureVisible( prev );
+                            break;
+                        }
+                    }
+                }
+                if (prev)
+                {
+                    while ( IsExpanded(prev) && HasChildren(prev) )
+                    {
+                        wxTreeItemId child = GetLastChild(prev);
+                        if ( child )
+                        {
+                            prev = child;
+                        }
+                    }
+
+                    SelectItem( prev, unselect_others, extended_select );
+                    m_key_current=prev.m_pItem;
+                    EnsureVisible( prev );
+                }
+            }
+            break;
+
+            // left arrow goes to the parent
+        case WXK_LEFT:
+            {
+                wxTreeItemId prev = GetParent( m_current );
+                if (prev)
+                {
+                    EnsureVisible( prev );
+                    SelectItem( prev, unselect_others, extended_select );
+                }
+            }
+            break;
+
+        case WXK_RIGHT:
+            // this works the same as the down arrow except that we also expand the
+            // item if it wasn't expanded yet
+            Expand(m_current);
+            // fall through
+
+        case WXK_DOWN:
+            {
+                if (IsExpanded(m_key_current) && HasChildren(m_key_current))
+                {
+                    long cookie = 0;
+                    wxTreeItemId child = GetFirstChild( m_key_current, cookie );
+                    SelectItem( child, unselect_others, extended_select );
+                    m_key_current=child.m_pItem;
+                    EnsureVisible( child );
+                }
+                else
+                {
+                    wxTreeItemId next = GetNextSibling( m_key_current );
+//                    if (next == 0)
+                    if (!next)
+                    {
+                        wxTreeItemId current = m_key_current;
+                        while (current && !next)
+                        {
+                            current = GetParent( current );
+                            if (current) next = GetNextSibling( current );
+                        }
+                    }
+//                    if (next != 0)
+                    if (next)
+                    {
+                        SelectItem( next, unselect_others, extended_select );
+                        m_key_current=next.m_pItem;
+                        EnsureVisible( next );
+                    }
+                }
+            }
+            break;
+
+            // <End> selects the last visible tree item
+        case WXK_END:
+            {
+                wxTreeItemId last = GetRootItem();
+
+                while ( last.IsOk() && IsExpanded(last) )
+                {
+                    wxTreeItemId lastChild = GetLastChild(last);
+
+                    // it may happen if the item was expanded but then all of
+                    // its children have been deleted - so IsExpanded() returned
+                    // TRUE, but GetLastChild() returned invalid item
+                    if ( !lastChild )
+                        break;
+
+                    last = lastChild;
+                }
+
+                if ( last.IsOk() )
+                {
+                    EnsureVisible( last );
+                    SelectItem( last, unselect_others, extended_select );
+                }
+            }
+            break;
+
+            // <Home> selects the root item
+        case WXK_HOME:
+            {
+                wxTreeItemId prev = GetRootItem();
+                if (prev)
+                {
+                    EnsureVisible( prev );
+                    SelectItem( prev, unselect_others, extended_select );
+                }
+            }
+            break;
+
+        default:
+            event.Skip();
+    }

 }
 
 }
 

-void wxTreeCtrl::OnMouse( const wxMouseEvent &event )
+wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)

 {
 {

-  if (!event.LeftDown() &&
-      !event.LeftDClick()) return;
+    wxClientDC dc(this);
+    PrepareDC(dc);
+    long x = dc.DeviceToLogicalX( (long)point.x );
+    long y = dc.DeviceToLogicalY( (long)point.y );
+    int w, h;
+    GetSize(&w, &h);

 
 

-  wxClientDC dc(this);
-  PrepareDC(dc);
-  long x = dc.DeviceToLogicalX( (long)event.GetX() );
-  long y = dc.DeviceToLogicalY( (long)event.GetY() );
+    flags=0;
+    if (point.x<0) flags|=wxTREE_HITTEST_TOLEFT;
+    if (point.x>w) flags|=wxTREE_HITTEST_TORIGHT;
+    if (point.y<0) flags|=wxTREE_HITTEST_ABOVE;
+    if (point.y>h) flags|=wxTREE_HITTEST_BELOW;

 
 

-  int flag = 0;
-  long id = HitTest( wxPoint(x,y), flag );
-  if (id == -1)
-    return;
-  wxGenericTreeItem *item = FindItem( id );
+    return m_anchor->HitTest( wxPoint(x, y), this, flags);
+}

 
 

-  if (!item) return;
-  if ((flag != wxTREE_HITTEST_ONITEMBUTTON) &&
-      (flag != wxTREE_HITTEST_ONITEMLABEL)) return;
+/* **** */

 
 

-  SelectItem(item);
+void wxTreeCtrl::Edit( const wxTreeItemId& item )
+{
+    if (!item.IsOk()) return;

 
 

-  if (event.LeftDClick())
-    m_current->SendKeyDown( this );
+    m_currentEdit = item.m_pItem;
+    
+    wxTreeEvent te( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, GetId() );
+    te.m_item = m_currentEdit;
+    te.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( te );

 
 

-  if (flag == wxTREE_HITTEST_ONITEMBUTTON)
-  {
-    ExpandItem( item->m_itemId, wxTREE_EXPAND_TOGGLE );
-    return;
-  }
+    if (!te.IsAllowed()) return;
+    
+    wxString s = m_currentEdit->GetText();
+    int x = m_currentEdit->GetX();
+    int y = m_currentEdit->GetY();
+    int w = m_currentEdit->GetWidth();
+    int h = m_currentEdit->GetHeight();
+
+    wxClientDC dc(this);
+    PrepareDC( dc );
+    x = dc.LogicalToDeviceX( x );
+    y = dc.LogicalToDeviceY( y );
+
+    wxTreeTextCtrl *text = new wxTreeTextCtrl(
+      this, -1, &m_renameAccept, &m_renameRes, this, s, wxPoint(x-4,y-4), wxSize(w+11,h+8) );
+    text->SetFocus();

 }
 
 }
 

-void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
+void wxTreeCtrl::OnRenameTimer()

 {
 {

-  int horizX = level*m_indent;
+    Edit( m_current );
+}

 
 

-  item->m_x = horizX+33;
-  item->m_y = y-m_lineHeight/3-2;
-  item->m_height = m_lineHeight;
+void wxTreeCtrl::OnRenameAccept()
+{
+    wxTreeEvent le( wxEVT_COMMAND_TREE_END_LABEL_EDIT, GetId() );
+    le.m_item = m_currentEdit;
+    le.SetEventObject( this );
+    le.m_label = m_renameRes;
+    GetEventHandler()->ProcessEvent( le );
+    
+    if (!le.IsAllowed()) return;
+    
+    /* DO CHANGE LABEL */
+}
+    
+void wxTreeCtrl::OnMouse( wxMouseEvent &event )
+{
+    if (!event.LeftIsDown()) m_dragCount = 0;

 
 

-  if (item->NumberOfVisibleChildren() == 0) return;
+    if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return;

 
 

-  wxNode *node = item->m_children.First();
-  while (node)
-  {
-    wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();
+    if ( !m_anchor ) return;

 
 

-    y += m_lineHeight;
-    CalculateLevel( child, dc, level+1, y );
+    wxClientDC dc(this);
+    PrepareDC(dc);
+    long x = dc.DeviceToLogicalX( (long)event.GetX() );
+    long y = dc.DeviceToLogicalY( (long)event.GetY() );

 
 

-    node = node->Next();
-  }
+    int flags=0;
+    wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), this, flags);
+    bool onButton = flags & wxTREE_HITTEST_ONITEMBUTTON;
+
+    if (item == NULL) return;  /* we hit the blank area */
+
+    if (event.Dragging())
+    {
+        if (m_dragCount == 2)  /* small drag latency (3?) */
+        {
+            m_dragCount = 0;
+
+            wxTreeEvent nevent(wxEVT_COMMAND_TREE_BEGIN_DRAG, GetId());
+            nevent.m_item = m_current;
+            nevent.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(nevent);
+        }
+        else
+        {
+            m_dragCount++;
+        }
+        return;
+    }
+
+    if (event.LeftUp() && (item == m_current) && 
+        (flags & wxTREE_HITTEST_ONITEMLABEL) && 
+       HasFlag(wxTR_EDIT_LABELS) )
+    {
+        m_renameTimer->Start( 100, TRUE );
+        return;
+    }
+    
+    bool is_multiple=(GetWindowStyleFlag() & wxTR_MULTIPLE);
+    bool extended_select=(event.ShiftDown() && is_multiple);
+    bool unselect_others=!(extended_select || (event.ControlDown() && is_multiple));
+
+    if (onButton)
+    {
+        Toggle( item );
+        if (is_multiple)
+            return;
+    }
+
+    SelectItem(item, unselect_others, extended_select);
+
+    if (event.LeftDClick())
+    {
+        wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
+        event.m_item = item;
+        event.m_code = 0;
+        event.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event );
+    }
+}
+
+void wxTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
+{
+    /* after all changes have been done to the tree control,
+     * we actually redraw the tree when everything is over */
+
+    if (!m_dirty)
+        return;
+
+    m_dirty = FALSE;
+
+    CalculatePositions();
+    Refresh();
+    AdjustMyScrollbars();
+}
+
+void wxTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc )
+{
+    long text_w = 0;
+    long text_h = 0;
+    // TODO : check for boldness. Here with suppose that font normal and bold
+    //        have the same height !
+    // TODO : bug here, text_w is sometime not the correct answer !!!
+    dc.GetTextExtent( item->GetText(), &text_w, &text_h );
+    text_h+=4;
+
+    int image_h = 0;
+    int image_w = 0;
+    if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
+    {
+        m_imageListNormal->GetSize( item->GetSelectedImage(), image_w, image_h );
+        image_w += 4;
+    }
+    else if (item->GetImage() != -1)
+    {
+        m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );
+        image_w += 4;
+    }
+
+    int total_h = (image_h > text_h) ? image_h : text_h;
+
+    if (total_h<40) total_h+=4; // at least 4 pixels
+    else total_h+=total_h/10;   // otherwise 10% extra spacing
+
+    item->SetHeight(total_h);
+    if (total_h>m_lineHeight) m_lineHeight=total_h;
+
+    item->SetWidth(image_w+text_w+2);
+}
+
+// -----------------------------------------------------------------------------
+// for developper : y is now the top of the level
+// not the middle of it !
+void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
+{
+    int horizX = level*m_indent;
+
+    CalculateSize( item, dc );
+
+    // set its position
+    item->SetX( horizX+m_indent+m_spacing );
+    item->SetY( y );
+    y+=GetLineHeight(item);
+
+    if ( !item->IsExpanded() )
+    {
+        // we dont need to calculate collapsed branches
+        return;
+    }
+
+    wxArrayGenericTreeItems& children = item->GetChildren();
+    size_t n, count = children.Count();
+    for (n = 0; n < count; ++n )
+      CalculateLevel( children[n], dc, level+1, y );  // recurse

 }
 
 void wxTreeCtrl::CalculatePositions()
 {
 }
 
 void wxTreeCtrl::CalculatePositions()
 {

-  if (!m_anchor)
-    return;
+    if ( !m_anchor ) return;

 
 

-  wxClientDC dc(this);
-  PrepareDC( dc );
+    wxClientDC dc(this);
+    PrepareDC( dc );

 
 

-  dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_SYSTEM_FONT ) );
+    dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) );

 
 

-  dc.SetPen( m_dottedPen );
-  m_lineHeight = (int)(dc.GetCharHeight() + 4);
+    dc.SetPen( m_dottedPen );
+    //if(GetImageList() == NULL)
+    // m_lineHeight = (int)(dc.GetCharHeight() + 4);

 
 

-  int y = m_lineHeight / 2 + 2;
-  CalculateLevel( m_anchor, dc, 0, y );
+    int y = 2; //GetLineHeight(m_anchor) / 2 + 2;
+    CalculateLevel( m_anchor, dc, 0, y ); // start recursion

 }
 
 }
 

-wxGenericTreeItem *wxTreeCtrl::FindItem( long itemId ) const
+void wxTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)

 {
 {

-  if (!m_anchor) return (wxGenericTreeItem *) NULL;
-  return m_anchor->FindItem( itemId );
+    wxClientDC dc(this);
+    PrepareDC(dc);
+
+    int cw = 0;
+    int ch = 0;
+    GetClientSize( &cw, &ch );
+
+    wxRect rect;
+    rect.x = dc.LogicalToDeviceX( 0 );
+    rect.width = cw;
+    rect.y = dc.LogicalToDeviceY( item->GetY() );
+    rect.height = ch;
+
+    Refresh( TRUE, &rect );
+
+    AdjustMyScrollbars();

 }
 
 void wxTreeCtrl::RefreshLine( wxGenericTreeItem *item )
 {
 }
 
 void wxTreeCtrl::RefreshLine( wxGenericTreeItem *item )
 {

-  if (!item) return;
-  wxClientDC dc(this);
-  PrepareDC( dc );
-  wxRect rect;
-  rect.x = dc.LogicalToDeviceX( item->m_x-2 );
-  rect.y = dc.LogicalToDeviceY( item->m_y-2 );
-  rect.width = 1000;
-  rect.height = dc.GetCharHeight()+6;
-  Refresh( TRUE, &rect );
-}
+    wxClientDC dc(this);
+    PrepareDC( dc );

 
 

+    wxRect rect;
+    rect.x = dc.LogicalToDeviceX( item->GetX() - 2 );
+    rect.y = dc.LogicalToDeviceY( item->GetY());
+    rect.width = 1000;
+    rect.height = GetLineHeight(item); //dc.GetCharHeight() + 6;

 
 

+    Refresh( TRUE, &rect );
+}