]> git.saurik.com Git - wxWidgets.git/blobdiff - src/generic/treectrl.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Implemented flat toolbars
[wxWidgets.git] / src / generic / treectrl.cpp
diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index e6504c9bece29477f4245cd74ae4b167e3088b02..2494432374c41d31535d8e251e73a9bd6caeaab6 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -1,193 +1,262 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
 
 #endif
 
-#include "wx/treectrl.h"
+#include "wx/generic/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/dcclient.h"
+#include "wx/msgdlg.h"
+
+// -----------------------------------------------------------------------------
+// array types
+// -----------------------------------------------------------------------------
 
 
-//-----------------------------------------------------------------------------
-// wxTreeItem
-//-----------------------------------------------------------------------------
+class WXDLLEXPORT wxGenericTreeItem;
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject)
+WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayTreeItems);
 
 
-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 );
+
+  ~wxGenericTreeItem();
+
+  // trivial accessors
+  wxArrayTreeItems& 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, wxDC& dc );
+  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 SetHeight(int h) { m_height = h; }
+
+  void SetX(int x) { m_x = x; }
+  void SetY(int y) { m_y = y; }
+
+  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 );
+
+  // 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, bool &onButton );
+
+  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; }
+
+private:
+  wxString            m_text;
+
+  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;
+  wxArrayTreeItems    m_children;
+  wxGenericTreeItem  *m_parent;
+};
+
+// =============================================================================
+// implementation
+// =============================================================================
 
 
-//-----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // wxTreeEvent
 // wxTreeEvent
-//-----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent,wxCommandEvent)
+IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
 
 
-wxTreeEvent::wxTreeEvent( wxEventType commandType, int id ) :
-  wxCommandEvent( commandType, id )
+wxTreeEvent::wxTreeEvent( wxEventType commandType, int id )
+           : wxNotifyEvent( commandType, id )
 {
   m_code = 0;
 {
   m_code = 0;
-  m_oldItem = 0;
+  m_itemOld = (wxGenericTreeItem *)NULL;
 }
 
 }
 
-//-----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // wxGenericTreeItem
 // wxGenericTreeItem
-//-----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericTreeItem,wxObject)
-
-wxGenericTreeItem::wxGenericTreeItem( wxGenericTreeItem *parent )
+wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
+                                     const wxString& text,
+                                     wxDC& dc,
+                                     int image, int selImage,
+                                     wxTreeItemData *data)
+                 : m_text(text)
 {
 {
-  Reset();
-  m_parent = parent;
+  m_image = image;
+  m_selImage = selImage;
+  m_data = data;
+  m_x = m_y = 0;
+  m_xCross = m_yCross = 0;
+
+  m_level = 0;
+
+  m_isCollapsed = TRUE;
   m_hasHilight = FALSE;
   m_hasHilight = FALSE;
-}
+  m_hasPlus = FALSE;
+  m_isBold = FALSE;
 
 
-wxGenericTreeItem::wxGenericTreeItem( wxGenericTreeItem *parent, const wxTreeItem& item, wxDC *dc )
-{
-  Reset();
-  SetItem( item, dc );
   m_parent = parent;
   m_parent = parent;
-  m_hasHilight = FALSE;
-}
 
 
-void wxGenericTreeItem::SetItem( const wxTreeItem &item, wxDC *dc )
-{
-  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;
+  dc.GetTextExtent( m_text, &m_width, &m_height );
 }
 
 }
 
-void wxGenericTreeItem::SetText( const wxString &text, wxDC *dc )
+wxGenericTreeItem::~wxGenericTreeItem()
 {
 {
-  m_text = text;
-  long lw = 0;
-  long lh = 0;
-  dc->GetTextExtent( m_text, &lw, &lh );
-  m_width = lw;
-  m_height = lh;
-}
+  delete m_data;
 
 
-void wxGenericTreeItem::Reset()
-{
-  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_level = 0;
-  m_children.DeleteContents( TRUE );
-  m_isCollapsed = TRUE;
-  m_parent = (wxGenericTreeItem *) NULL;
+  wxASSERT_MSG( m_children.IsEmpty(),
+                _T("please call DeleteChildren() before deleting the item") );
 }
 
 }
 
-void wxGenericTreeItem::GetItem( wxTreeItem &item ) const
+void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree)
 {
 {
-  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;
-}
+  size_t count = m_children.Count();
+  for ( size_t n = 0; n < count; n++ )
+  {
+    wxGenericTreeItem *child = m_children[n];
+    if ( tree )
+    {
+      tree->SendDeleteEvent(child);
+    }
 
 
-bool wxGenericTreeItem::HasChildren()
-{
-  return m_hasChildren;
+    child->DeleteChildren(tree);
+    delete child;
+  }
+
+  m_children.Empty();
 }
 
 }
 
-bool wxGenericTreeItem::HasPlus()
+void wxGenericTreeItem::SetText( const wxString &text, wxDC& dc )
 {
 {
-  if ( !HasChildren() )
-    return FALSE;
+  m_text = text;
 
 
-  return !IsExpanded();
+  dc.GetTextExtent( m_text, &m_width, &m_height );
 }
 
 }
 
-int wxGenericTreeItem::NumberOfVisibleDescendents()
+void wxGenericTreeItem::Reset()
 {
 {
-  int ret = m_children.Number();
-  wxNode *node = m_children.First();
-  while (node)
-  {
-    wxGenericTreeItem *item = (wxGenericTreeItem*)node->Data();
-    ret += item->NumberOfVisibleDescendents();
-    node = node->Next();
-  }
-  return ret;
-}
+  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;
 
 
-int wxGenericTreeItem::NumberOfVisibleChildren()
-{
-  return m_isCollapsed ? 0 : m_children.Number();
+  m_level = 0;
+
+  DeleteChildren();
+  m_isCollapsed = TRUE;
+
+  m_parent = (wxGenericTreeItem *)NULL;
 }
 
 }
 
-wxGenericTreeItem *wxGenericTreeItem::FindItem( long itemId ) const
+size_t wxGenericTreeItem::GetChildrenCount(bool recursively) const
 {
 {
-  if (m_itemId == itemId) return (wxGenericTreeItem*)(this);
-  wxNode *node = m_children.First();
-  while (node)
+  size_t count = m_children.Count();
+  if ( !recursively )
+    return count;
+
+  size_t total = count;
+  for ( size_t n = 0; n < count; n++ )
   {
   {
-    wxGenericTreeItem *item = (wxGenericTreeItem*)node->Data();
-    wxGenericTreeItem *res = item->FindItem( itemId );
-    if (res) return (wxGenericTreeItem*)(res);
-    node = node->Next();
+    total += m_children[n]->GetChildrenCount();
   }
   }
-  return (wxGenericTreeItem *) NULL;
-}
 
 
-void wxGenericTreeItem::AddChild( wxGenericTreeItem *child )
-{
-  m_children.Append( child );
+  return total;
 }
 
 void wxGenericTreeItem::SetCross( int x, int y )
 }
 
 void wxGenericTreeItem::SetCross( int x, int y )
@@ -198,143 +267,68 @@ void wxGenericTreeItem::SetCross( int x, int y )
 
 void wxGenericTreeItem::GetSize( int &x, int &y )
 {
 
 void wxGenericTreeItem::GetSize( int &x, int &y )
 {
-  if (y < m_y + 10) y = m_y +10;
+  if ( y < m_y ) y = m_y;
   int width = m_x +  m_width;
   if (width > x) x = width;
   int width = m_x +  m_width;
   if (width > x) x = width;
-  wxNode *node = m_children.First();
-  while (node)
+
+  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 );
+    }
   }
 }
 
   }
 }
 
-long wxGenericTreeItem::HitTest( const wxPoint& point, int &flags )
+wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
+                                               bool &onButton )
 {
 {
-  if ((point.y > m_y) && (point.y < m_y+m_height))
+  if ((point.y > m_y) && (point.y < m_y + m_height))
   {
   {
-    if ((point.x > m_xCross-5) &&
-        (point.x < m_xCross+5) &&
-        (point.y > m_yCross-5) &&
-        (point.y < m_yCross+5) &&
-        (m_hasChildren))
-    {
-      flags = wxTREE_HITTEST_ONITEMBUTTON;
-      return m_itemId;
-    }
-    if ((point.x > m_x) && (point.x < m_x+m_width))
+    // 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_ONITEMLABEL;
-      return m_itemId;
+      onButton = TRUE;
+      return this;
     }
     }
-    if (point.x > m_x)
+
+    /* TODO: we should do a query here like
+         m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );  */
+    int w = m_width;
+    if (m_image != -1) w += 24;
+
+    if ((point.x > m_x) && (point.x < m_x+w))
     {
     {
-      flags = wxTREE_HITTEST_ONITEMRIGHT;
-      return m_itemId;
+      onButton = FALSE;
+      return this;
     }
     }
-    flags = wxTREE_HITTEST_ONITEMINDENT;
-    return m_itemId;
   }
   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, onButton );
+        if ( res != NULL )
+          return res;
       }
     }
   }
       }
     }
   }
-  return -1;
-}
-
-void wxGenericTreeItem::PrepareEvent( wxTreeEvent &event )
-{
-  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;
-}
-
-void wxGenericTreeItem::SendKeyDown( wxWindow *target )
-{
-  wxTreeEvent event( wxEVT_COMMAND_TREE_KEY_DOWN, target->GetId() );
-  PrepareEvent( event );
-  event.SetEventObject( target );
-  target->ProcessEvent( event );
-}
-
-void wxGenericTreeItem::SendSelected( wxWindow *target )
-{
-  wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGED, target->GetId() );
-  PrepareEvent( event );
-  event.SetEventObject( target );
-  target->ProcessEvent( event );
-}
-
-void wxGenericTreeItem::SendDelete( wxWindow *target )
-{
-  wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, target->GetId() );
-  PrepareEvent( event );
-  event.SetEventObject( target );
-  target->ProcessEvent( event );
-}
-
-void wxGenericTreeItem::SendExpand( wxWindow *target )
-{
-  m_isCollapsed = FALSE;
-
-  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, target->GetId() );
-  event.SetEventObject( target );
-  PrepareEvent( event );
-  target->ProcessEvent( event );
-
-  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
-  PrepareEvent( event );
-  target->ProcessEvent( event );
-}
-
-void wxGenericTreeItem::SendCollapse( wxWindow *target )
-{
-  m_isCollapsed = TRUE;
-
-  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, target->GetId() );
-  event.SetEventObject( target );
-  PrepareEvent( event );
-  target->ProcessEvent( event );
-
-  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
-  PrepareEvent( event );
-  target->ProcessEvent( event );
-}
 
 
-void wxGenericTreeItem::SetHilight( bool set )
-{
-  m_hasHilight = set;
-}
-
-bool wxGenericTreeItem::HasHilight()
-{
-  return m_hasHilight;
+  return NULL;
 }
 
 }
 
-//-----------------------------------------------------------------------------
-// wxTreeCtrl
-//-----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+// wxTreeCtrl implementation
+// -----------------------------------------------------------------------------
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl,wxScrolledWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxScrolledWindow)
 
 BEGIN_EVENT_TABLE(wxTreeCtrl,wxScrolledWindow)
   EVT_PAINT          (wxTreeCtrl::OnPaint)
 
 BEGIN_EVENT_TABLE(wxTreeCtrl,wxScrolledWindow)
   EVT_PAINT          (wxTreeCtrl::OnPaint)
@@ -342,807 +336,1271 @@ BEGIN_EVENT_TABLE(wxTreeCtrl,wxScrolledWindow)
   EVT_CHAR           (wxTreeCtrl::OnChar)
   EVT_SET_FOCUS      (wxTreeCtrl::OnSetFocus)
   EVT_KILL_FOCUS     (wxTreeCtrl::OnKillFocus)
   EVT_CHAR           (wxTreeCtrl::OnChar)
   EVT_SET_FOCUS      (wxTreeCtrl::OnSetFocus)
   EVT_KILL_FOCUS     (wxTreeCtrl::OnKillFocus)
+  EVT_IDLE           (wxTreeCtrl::OnIdle)
 END_EVENT_TABLE()
 
 END_EVENT_TABLE()
 
-wxTreeCtrl::wxTreeCtrl()
+// -----------------------------------------------------------------------------
+// construction/destruction
+// -----------------------------------------------------------------------------
+void wxTreeCtrl::Init()
 {
 {
-  m_current = (wxGenericTreeItem *) NULL;
+  m_current =
   m_anchor = (wxGenericTreeItem *) NULL;
   m_hasFocus = FALSE;
   m_anchor = (wxGenericTreeItem *) NULL;
   m_hasFocus = FALSE;
+  m_dirty = FALSE;
+
   m_xScroll = 0;
   m_yScroll = 0;
   m_xScroll = 0;
   m_yScroll = 0;
-  m_lastId = 0;
   m_lineHeight = 10;
   m_indent = 15;
   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;
+
+  m_hilightBrush = new wxBrush
+    (
+      wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT),
+      wxSOLID
+    );
+
+  m_imageListNormal =
+  m_imageListState = (wxImageList *) NULL;
+
+  m_dragCount = 0;
 }
 
 }
 
-wxTreeCtrl::wxTreeCtrl(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos, const wxSize& size,
-            long style, const wxString& name )
+bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
+                        const wxPoint& pos, const wxSize& size,
+                        long style,
+            const wxValidator &validator,
+            const wxString& name )
 {
 {
-  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 );
+  Init();
+
+  wxScrolledWindow::Create( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name );
+
+  SetValidator( validator );
+
+  SetBackgroundColour( *wxWHITE );
+  m_dottedPen = wxPen( *wxBLACK, 0, 0 );
+
+  return TRUE;
 }
 
 wxTreeCtrl::~wxTreeCtrl()
 {
 }
 
 wxTreeCtrl::~wxTreeCtrl()
 {
+  wxDELETE( m_hilightBrush );
+
+  DeleteAllItems();
 }
 
 }
 
-bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
-            const wxPoint& pos, const wxSize& size,
-            long style, const wxString& name )
+// -----------------------------------------------------------------------------
+// accessors
+// -----------------------------------------------------------------------------
+
+size_t wxTreeCtrl::GetCount() const
 {
 {
-  wxScrolledWindow::Create( parent, id, pos, size, style, name );
-  SetBackgroundColour( *wxWHITE );
-  m_dottedPen = wxPen( *wxBLACK, 0, 0 );
-  return TRUE;
+  return m_anchor == NULL ? 0u : m_anchor->GetChildrenCount();
 }
 
 }
 
-int wxTreeCtrl::GetCount() const
+void wxTreeCtrl::SetIndent(unsigned int indent)
 {
 {
-  if (!m_anchor) return 0;
-  return m_anchor->NumberOfVisibleDescendents();
+  m_indent = indent;
+  Refresh();
 }
 
 }
 
-long wxTreeCtrl::InsertItem( long parent, const wxString& label, int image,
-      int selImage, long WXUNUSED(insertAfter) )
+size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
 {
 {
-  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(), 0u, _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->GetChildrenCount(recursively);
+}
 
 
-  if (p)
-  {
-    CalculatePositions();
+// -----------------------------------------------------------------------------
+// functions to work with tree items
+// -----------------------------------------------------------------------------
 
 
-    if (!p->HasChildren()) p->m_hasChildren = TRUE;
+wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), _T(""), _T("invalid tree item") );
 
 
-    int ch = 0;
-    GetClientSize( (int *) NULL, &ch );
+  return item.m_pItem->GetText();
+}
 
 
-    PrepareDC( dc );
-    
-    wxRectangle rect;
-    rect.x = dc.LogicalToDeviceX( 0 ); 
-    rect.y = 0;
-    rect.width = 10000; 
-    rect.height = ch;
+int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), -1, _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 );
-    }
+  return item.m_pItem->GetImage();
+}
 
 
-    AdjustMyScrollbars();
+int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") );
 
 
-    if (rect.height > 0) Refresh( FALSE, &rect);
-  }
-  else
-  {
-    AdjustMyScrollbars();
+  return item.m_pItem->GetSelectedImage();
+}
 
 
-    Refresh();
-  }
+wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), NULL, _T("invalid tree item") );
 
 
-  return m_lastId;
+  return item.m_pItem->GetData();
 }
 
 }
 
-long wxTreeCtrl::InsertItem( long parent, wxTreeItem &info, long WXUNUSED(insertAfter) )
+void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
 {
 {
-  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)
-  {
-    m_lastId++;
-    info.m_itemId = m_lastId;
-    info.m_mask |= wxTREE_MASK_HANDLE;
-    ret = m_lastId;
-  }
-  else
-  {
-    ret = info.m_itemId;
-  }
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
 
   wxClientDC dc(this);
 
   wxClientDC dc(this);
-  wxGenericTreeItem *new_child = new wxGenericTreeItem( p, info, &dc );
-  if (p)
-    p->AddChild( new_child );
-  else
-    m_anchor = new_child;
-
-  if (p)
-  {
-    CalculatePositions();
+  wxGenericTreeItem *pItem = item.m_pItem;
+  pItem->SetText(text, dc);
+  RefreshLine(pItem);
+}
 
 
-    if (!p->HasChildren()) p->m_hasChildren = TRUE;
+void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
+{
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
 
 
-    int ch = 0;
-    GetClientSize( (int *) NULL, &ch );
+  wxGenericTreeItem *pItem = item.m_pItem;
+  pItem->SetImage(image);
+  RefreshLine(pItem);
+}
 
 
-    PrepareDC( dc );
-    
-    wxRectangle rect;
-    rect.x = dc.LogicalToDeviceX( 0 ); 
-    rect.y = 0;
-    rect.width = 10000; 
-    rect.height = ch;
+void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
+{
+  wxCHECK_RET( item.IsOk(), _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 *pItem = item.m_pItem;
+  pItem->SetSelectedImage(image);
+  RefreshLine(pItem);
+}
 
 
-    AdjustMyScrollbars();
+void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
+{
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
 
 
-    if (rect.height > 0) Refresh( FALSE, &rect);
-  }
-  else
-  {
-    AdjustMyScrollbars();
+  item.m_pItem->SetData(data);
+}
 
 
-    Refresh();
-  }
+void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
+{
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
 
 
-  info.m_mask = oldMask;
-  return ret;
+  wxGenericTreeItem *pItem = item.m_pItem;
+  pItem->SetHasPlus(has);
+  RefreshLine(pItem);
 }
 
 }
 
-bool wxTreeCtrl::ExpandItem( long item, int action )
+void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i)
-    return FALSE;
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
 
 
-  switch (action)
+  // avoid redrawing the tree if no real change
+  wxGenericTreeItem *pItem = item.m_pItem;
+  if ( pItem->IsBold() != bold )
   {
   {
-    case wxTREE_EXPAND_EXPAND:
-    {
-      i->SendExpand( this );
-      break;
-    }
-
-    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();
-      }
-
-      CalculatePositions();
-
-      i->SendCollapse( this );
-      break;
-    }
-
-    case wxTREE_EXPAND_TOGGLE:
-    {
-      if ( i->IsExpanded() )
-        ExpandItem( item, wxTREE_EXPAND_COLLAPSE );
-      else
-        ExpandItem( item, wxTREE_EXPAND_EXPAND );
-      return TRUE;
-    }
+    pItem->SetBold(bold);
+    RefreshLine(pItem);
   }
   }
+}
 
 
-  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 );
+// -----------------------------------------------------------------------------
+// item status inquiries
+// -----------------------------------------------------------------------------
 
 
-  AdjustMyScrollbars();
+bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const
+{
+  wxFAIL_MSG(_T("not implemented"));
 
   return TRUE;
 }
 
 
   return TRUE;
 }
 
-void wxTreeCtrl::DeleteItem( long item )
+bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 {
 {
-  wxGenericTreeItem *pItem = FindItem( item );
-  wxCHECK_RET( pItem != NULL, _("wxTreeCtrl::DeleteItem: no such pItem.") );
-
-  pItem->m_parent->m_children.DeleteObject(pItem);
+  wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
 
 
-  Refresh();
+  return !item.m_pItem->GetChildren().IsEmpty();
 }
 
 }
 
-void wxTreeCtrl::DeleteChildren( long item )
+bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
 {
 {
-  wxGenericTreeItem *pItem = FindItem( item );
-  wxCHECK_RET( pItem != NULL, _("wxTreeCtrl::DeleteChildren: no such pItem.") );
-
-  pItem->m_children.Clear();
+  wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
 
 
-  Refresh();
+  return item.m_pItem->IsExpanded();
 }
 
 }
 
-bool wxTreeCtrl::DeleteAllItems()
+bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
 {
 {
-  delete m_anchor;
-  m_anchor = (wxGenericTreeItem *) NULL;
-  Refresh();
-  return TRUE;
-}
+  wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
 
 
-bool wxTreeCtrl::GetItem( wxTreeItem &info ) const
-{
-  wxGenericTreeItem *i = FindItem( info.m_itemId );
-  if (!i) return FALSE;
-  i->GetItem( info );
-  return TRUE;
+  return item.m_pItem->HasHilight();
 }
 
 }
 
-long wxTreeCtrl::GetItemData( long item ) const
+bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return 0;
-  return i->m_data;
+  wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
+
+  return item.m_pItem->IsBold();
 }
 
 }
 
-wxString wxTreeCtrl::GetItemText( long item ) const
+// -----------------------------------------------------------------------------
+// navigation
+// -----------------------------------------------------------------------------
+
+wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return "";
-  return i->m_text;
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+
+  return item.m_pItem->GetParent();
 }
 
 }
 
-int wxTreeCtrl::GetItemImage(long item) const
+wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  return i == 0 ? -1 : i->GetImage();
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+
+  cookie = 0;
+  return GetNextChild(item, cookie);
 }
 
 }
 
-long wxTreeCtrl::GetParent( long item ) const
+wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return -1;
-  i = i->m_parent;
-  if (!i) return -1;
-  return i->m_parent->m_itemId;
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+
+  wxArrayTreeItems& children = item.m_pItem->GetChildren();
+  if ( (size_t)cookie < children.Count() )
+  {
+    return children.Item(cookie++);
+  }
+  else
+  {
+    // there are no more of them
+    return wxTreeItemId();
+  }
 }
 
 }
 
-long wxTreeCtrl::GetRootItem() const
+wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
 {
 {
-  if (m_anchor) return m_anchor->m_itemId;
-  return -1;
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+
+  wxArrayTreeItems& children = item.m_pItem->GetChildren();
+  return (children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last()));
 }
 
 }
 
-long wxTreeCtrl::GetChild( long item ) const
+wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
 {
 {
-  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;
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+
+  wxGenericTreeItem *i = item.m_pItem;
+  wxGenericTreeItem *parent = i->GetParent();
+  if ( parent == NULL )
+  {
+    // root item doesn't have any siblings
+    return wxTreeItemId();
+  }
+
+  wxArrayTreeItems& siblings = parent->GetChildren();
+  int index = siblings.Index(i);
+  wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?
+
+  size_t n = (size_t)(index + 1);
+  return n == siblings.Count() ? wxTreeItemId() : wxTreeItemId(siblings[n]);
 }
 
 }
 
-long wxTreeCtrl::GetNextItem( long item, int code ) const
+wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
 {
 {
-  switch (code)
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+
+  wxGenericTreeItem *i = item.m_pItem;
+  wxGenericTreeItem *parent = i->GetParent();
+  if ( parent == NULL )
   {
   {
-    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:
-    {
-      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;
-    }
-    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;
-    }
+    // root item doesn't have any siblings
+    return wxTreeItemId();
   }
   }
-  return -1;
+
+  wxArrayTreeItems& siblings = parent->GetChildren();
+  int index = siblings.Index(i);
+  wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?
+
+  return index == 0 ? wxTreeItemId()
+                    : wxTreeItemId(siblings[(size_t)(index - 1)]);
 }
 
 }
 
-long wxTreeCtrl::GetSelection() const
+wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
 {
 {
-  return m_current ? m_current->GetItemId() : -1;
+  wxFAIL_MSG(_T("not implemented"));
+
+  return wxTreeItemId();
 }
 
 }
 
-bool wxTreeCtrl::SelectItem( long itemId )
+wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {
 {
-  wxGenericTreeItem *pItem = FindItem(itemId);
-  if ( !pItem ) {
-    wxLogDebug(_("Can't select an item %d which doesn't exist."), itemId);
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
 
 
-    return FALSE;
-  }
+  wxFAIL_MSG(_T("not implemented"));
 
 
-  SelectItem(pItem);
+  return wxTreeItemId();
+}
 
 
-  return TRUE;
+wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
+
+  wxFAIL_MSG(_T("not implemented"));
+
+  return wxTreeItemId();
 }
 
 }
 
-void wxTreeCtrl::SelectItem(wxGenericTreeItem *item)
+// -----------------------------------------------------------------------------
+// operations
+// -----------------------------------------------------------------------------
+
+wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parentId,
+                                      size_t previous,
+                                      const wxString& text,
+                                      int image, int selImage,
+                                      wxTreeItemData *data)
 {
 {
-  if (m_current != item)
+  wxGenericTreeItem *parent = parentId.m_pItem;
+  if ( !parent )
   {
   {
-    if (m_current)
-    {
-      m_current->SetHilight( FALSE );
-      RefreshLine( m_current );
-    }
-    m_current = item;
-    m_current->SetHilight( TRUE );
-    RefreshLine( m_current );
+    // should we give a warning here?
+    return AddRoot(text, image, selImage, data);
+  }
 
 
-    m_current->SendSelected( this );
+  wxClientDC dc(this);
+  wxGenericTreeItem *item = new wxGenericTreeItem(parent,
+                                                  text, dc,
+                                                  image, selImage,
+                                                  data);
+
+  if ( data != NULL )
+  {
+    data->m_pItem = item;
   }
   }
+
+  parent->Insert( item, previous );
+
+  m_dirty = TRUE;
+
+  return item;
 }
 
 }
 
-bool wxTreeCtrl::ItemHasChildren( long item ) const
+wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
+                                 int image, int selImage,
+                                 wxTreeItemData *data)
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return FALSE;
-  return i->m_hasChildren;
+  wxCHECK_MSG( !m_anchor, wxTreeItemId(), _T("tree can have only one root") );
+
+  wxClientDC dc(this);
+  m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc,
+                                   image, selImage, data);
+  if ( data != NULL )
+  {
+    data->m_pItem = m_anchor;
+  }
+
+  AdjustMyScrollbars();
+  Refresh();
+
+  return m_anchor;
 }
 
 }
 
-void wxTreeCtrl::SetIndent( int indent )
+wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent,
+                                     const wxString& text,
+                                     int image, int selImage,
+                                     wxTreeItemData *data)
 {
 {
-  m_indent = indent;
-  Refresh();
+  return DoInsertItem(parent, 0u, text, image, selImage, data);
 }
 
 }
 
-int wxTreeCtrl::GetIndent() const
+wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parentId,
+                                    const wxTreeItemId& idPrevious,
+                                    const wxString& text,
+                                    int image, int selImage,
+                                    wxTreeItemData *data)
 {
 {
-  return m_indent;
+  wxGenericTreeItem *parent = parentId.m_pItem;
+  if ( !parent )
+  {
+    // should we give a warning here?
+    return AddRoot(text, image, selImage, data);
+  }
+
+  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::SetItem( wxTreeItem &info )
+wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parentId,
+                                    const wxString& text,
+                                    int image, int selImage,
+                                    wxTreeItemData *data)
 {
 {
-  wxGenericTreeItem *i = FindItem( info.m_itemId );
-  if (!i) return FALSE;
-  wxClientDC dc(this);
-  i->SetItem( info, &dc );
-  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::SetItemData( long item, long data )
+void wxTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return FALSE;
-  i->m_data = data;
-  return TRUE;
+  wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, GetId() );
+  event.m_item = item;
+  event.SetEventObject( this );
+  ProcessEvent( event );
 }
 
 }
 
-bool wxTreeCtrl::SetItemText( long item, const wxString &text )
+void wxTreeCtrl::DeleteChildren(const wxTreeItemId& itemId)
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return FALSE;
-  wxClientDC dc(this);
-  i->SetText( text, &dc );
-  return TRUE;
+    wxGenericTreeItem *item = itemId.m_pItem;
+    item->DeleteChildren(this);
+
+    m_dirty = TRUE;
 }
 
 }
 
-void wxTreeCtrl::SetItemImage(long item, int image, int imageSel) const
+void wxTreeCtrl::Delete(const wxTreeItemId& itemId)
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if ( i != 0 ) 
+  wxGenericTreeItem *item = itemId.m_pItem;
+  wxGenericTreeItem *parent = item->GetParent();
+
+  if ( parent )
   {
   {
-    i->SetImage(image);
-    i->SetSelectedImage(imageSel);
+    parent->GetChildren().Remove(item);
   }
   }
+
+  item->DeleteChildren(this);
+  SendDeleteEvent(item);
+  delete item;
+
+  m_dirty = TRUE;
 }
 
 }
 
-int wxTreeCtrl::GetItemState( long item, long stateMask ) const
+void wxTreeCtrl::DeleteAllItems()
 {
 {
-  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;
-}
-
-bool wxTreeCtrl::SetItemState( long item, long state, long stateMask )
-{
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return FALSE;
-  
-  if (stateMask & wxTREE_STATE_FOCUSED)
+  if ( m_anchor )
   {
   {
-    if (state & wxTREE_STATE_FOCUSED)
-      SelectItem( i );
+    m_anchor->DeleteChildren(this);
+    delete m_anchor;
+
+    m_anchor = NULL;
+
+    m_dirty = TRUE;
   }
   }
-    
-  if (stateMask & wxTREE_STATE_SELECTED)
+}
+
+void wxTreeCtrl::Expand(const wxTreeItemId& 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 )
   {
   {
-    if (state & wxTREE_STATE_SELECTED)
-      SelectItem( i );
+    // cancelled by program
+    return;
   }
   }
-      
-  if (stateMask & wxTREE_STATE_EXPANDED)
+
+  item->Expand();
+  CalculatePositions();
+
+  RefreshSubtree(item);
+
+  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
+  ProcessEvent( event );
+}
+
+void wxTreeCtrl::Collapse(const wxTreeItemId& itemId)
+{
+  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 )
   {
   {
-    if (state & wxTREE_STATE_EXPANDED)
-      ExpandItem( i->m_itemId, wxTREE_EXPAND_EXPAND );
-    else
-      ExpandItem( i->m_itemId, wxTREE_EXPAND_COLLAPSE );
+    // cancelled by program
+    return;
   }
   }
-  
-  return TRUE;
+
+  item->Collapse();
+
+  wxArrayTreeItems& 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::HitTest( const wxPoint& point, int &flags )
+void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item)
 {
 {
-  flags = 0;
-  if (!m_anchor) return -1;
-  return m_anchor->HitTest( point, flags );
+  Collapse(item);
+  DeleteChildren(item);
 }
 
 }
 
-wxImageList *wxTreeCtrl::GetImageList( int which ) const
+void wxTreeCtrl::Toggle(const wxTreeItemId& itemId)
 {
 {
-  if (which == wxIMAGE_LIST_NORMAL) return m_imageList;
-  return m_smallImageList;
+  wxGenericTreeItem *item = itemId.m_pItem;
+
+  if ( item->IsExpanded() )
+    Collapse(itemId);
+  else
+    Expand(itemId);
 }
 
 }
 
-void wxTreeCtrl::SetImageList( wxImageList *imageList, int which )
+void wxTreeCtrl::Unselect()
 {
 {
-  if (which == wxIMAGE_LIST_NORMAL)
+  if ( m_current )
   {
   {
-    if (m_imageList) delete m_imageList;
-    m_imageList = imageList;
-  }
-  else
-  {
-    if (m_smallImageList) delete m_smallImageList;
-    m_smallImageList = imageList;
+    m_current->SetHilight( FALSE );
+    RefreshLine( m_current );
   }
 }
 
   }
 }
 
-void wxTreeCtrl::AdjustMyScrollbars()
+void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId)
 {
 {
-  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 );
-  }
-  else
+  wxGenericTreeItem *item = itemId.m_pItem;
+
+  if ( m_current != item )
   {
   {
-    SetScrollbars( 0, 0, 0, 0 );
+    wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() );
+    event.m_item = item;
+    event.m_itemOld = m_current;
+    event.SetEventObject( this );
+    if ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() )
+      return;
+
+    if ( m_current )
+    {
+      m_current->SetHilight( FALSE );
+      RefreshLine( m_current );
+    }
+
+    m_current = item;
+    m_current->SetHilight( TRUE );
+    RefreshLine( m_current );
+
+    event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
+    GetEventHandler()->ProcessEvent( event );
   }
 }
 
   }
 }
 
-void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
+void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 {
 {
-  int horizX = level*m_indent;
+    wxGenericTreeItem *gitem = item.m_pItem;
 
 
-  item->m_x = horizX+33;
-  item->m_y = y-m_lineHeight/3;
-  item->m_height = m_lineHeight;
+    // first expand all parent branches
+    wxGenericTreeItem *parent = gitem->GetParent();
+    while ( parent && !parent->IsExpanded() )
+    {
+        Expand(parent);
 
 
-  item->SetCross( horizX+15, y );
+        parent = parent->GetParent();
+    }
 
 
-  int oldY = y;
+    // now scroll to the item
+    int item_y = gitem->GetY();
 
 
-  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 start_x = 0;
+    int start_y = 0;
+    ViewStart( &start_x, &start_y );
+    start_y *= 10;
 
 
-    if (!item->HasChildren()) endX += 20;
-    
-    dc.DrawLine( startX, y, endX, y );
+    int client_h = 0;
+    int client_w = 0;
+    GetClientSize( &client_w, &client_h );
 
 
-      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())
-          dc.DrawLine( horizX+15, y-2, horizX+15, y+3 );
-      }
+    if (item_y < start_y+3)
+    {
+        int x = 0;
+        int y = 0;
+        m_anchor->GetSize( x, y );
+        y += 2*m_lineHeight;
+        int x_pos = GetScrollPos( wxHORIZONTAL );
+        SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 );
+    }
+    else if (item_y > start_y+client_h-16)
+    {
+       int x = 0;
+       int y = 0;
+       m_anchor->GetSize( x, y );
+       y += 2*m_lineHeight;
+       int x_pos = GetScrollPos( wxHORIZONTAL );
+       SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 );
+    }
+}
 
 
-      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)
+void wxTreeCtrl::ScrollTo(const wxTreeItemId& WXUNUSED(item))
+{
+    wxFAIL_MSG(_T("not implemented"));
+}
+
+wxTextCtrl *wxTreeCtrl::EditLabel( const wxTreeItemId& WXUNUSED(item),
+                                   wxClassInfo* WXUNUSED(textCtrlClass) )
+{
+    wxFAIL_MSG(_T("not implemented"));
+
+    return (wxTextCtrl*)NULL;
+}
+
+wxTextCtrl *wxTreeCtrl::GetEditControl() const
+{
+    wxFAIL_MSG(_T("not implemented"));
+
+    return (wxTextCtrl*)NULL;
+}
+
+void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool WXUNUSED(discardChanges))
+{
+    wxFAIL_MSG(_T("not implemented"));
+}
+
+// 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)
+{
+    wxCHECK_MSG( s_treeBeingSorted, 0, _T("bug in wxTreeCtrl::SortChildren()") );
+
+    return s_treeBeingSorted->OnCompareItems(*item1, *item2);
+}
+
+int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
+                               const wxTreeItemId& item2)
+{
+    return wxStrcmp(GetItemText(item1), GetItemText(item2));
+}
+
+void wxTreeCtrl::SortChildren(const wxTreeItemId& itemId)
+{
+    wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") );
+
+    wxGenericTreeItem *item = itemId.m_pItem;
+
+    wxCHECK_RET( !s_treeBeingSorted,
+                 _T("wxTreeCtrl::SortChildren is not reentrant") );
+
+    wxArrayTreeItems& 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
+}
+
+wxImageList *wxTreeCtrl::GetImageList() const
+{
+    return m_imageListNormal;
+}
+
+wxImageList *wxTreeCtrl::GetStateImageList() const
+{
+    return m_imageListState;
+}
+
+void wxTreeCtrl::SetImageList(wxImageList *imageList)
+{
+   m_imageListNormal = imageList;
+   // calculate a m_lineHeight value from the image sizes
+   wxPaintDC dc(this);
+   PrepareDC( dc );
+   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);
+      height += height/5;  //20% extra spacing
+      if(height > m_lineHeight) m_lineHeight = height;
+   }
+}
+
+void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
+{
+    m_imageListState = imageList;
+}
+
+// -----------------------------------------------------------------------------
+// helpers
+// -----------------------------------------------------------------------------
+
+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 );
+    }
+    else
+    {
+        SetScrollbars( 0, 0, 0, 0 );
+    }
+}
+
+void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
+{
+    // render bold items in bold
+    wxFont fontOld;
+    wxFont fontNew;
+
+    if (item->IsBold())
+    {
+        fontOld = dc.GetFont();
+        if (fontOld.Ok())
         {
         {
-          dc.SetPen( *wxBLACK_PEN );
-          dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
+          // 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
         {
         }
         else
         {
-          dc.SetPen( *wxTRANSPARENT_PEN );
-          dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
+            wxFAIL_MSG(_T("wxDC::GetFont() failed!"));
         }
         }
-        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 );
-      }
-  }
+    long text_w = 0;
+    long text_h = 0;
+    dc.GetTextExtent( item->GetText(), &text_w, &text_h );
 
 
-  if (item->NumberOfVisibleChildren() == 0) return;
+    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 semiOldY = y;
+    int total_h = (image_h > text_h) ? image_h : text_h;
+    if(m_lineHeight > total_h) total_h = m_lineHeight;
+    
+    dc.DrawRectangle( item->GetX()-2, item->GetY(), image_w+text_w+4, total_h );
 
 
-  wxNode *node = item->m_children.First();
-  while (node)
-  {
-    wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();
+    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();
+    }
 
 
-    y += m_lineHeight;
-    semiOldY = y;
+    dc.SetBackgroundMode(wxTRANSPARENT);
+    dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY()
+                 + ((total_h > text_h) ? (total_h - text_h)/2 : 0));
 
 
-    PaintLevel( child, dc, level+1, y );
+    // restore normal font for bold items
+    if (fontOld.Ok())
+    {
+        dc.SetFont( fontOld);
+    }
+}
 
 
-    node = node->Next();
-  }
+void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
+{
+    int horizX = level*m_indent;
+
+    item->SetX( horizX+33 );
+    item->SetY( y-m_lineHeight/2 );
+    item->SetHeight( m_lineHeight );
+
+    item->SetCross( horizX+15, y );
+
+    int oldY = y;
+
+    int exposed_x = dc.LogicalToDeviceX( 0 );
+    int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 );
+
+    if (IsExposed( exposed_x, exposed_y, 10000, m_lineHeight+4 ))  // 10000 = very much
+    {
+        int startX = horizX;
+        int endX = horizX + 10;
+
+        if (!item->HasChildren()) endX += 20;
+
+        dc.DrawLine( startX, y, endX, y );
+
+        if (item->HasPlus())
+        {
+            dc.DrawLine( horizX+20, y, horizX+30, y );
+            dc.SetPen( *wxGREY_PEN );
+            dc.SetBrush( *wxWHITE_BRUSH );
+            dc.DrawRectangle( horizX+10, y-4, 11, 9 );
+            dc.SetPen( *wxBLACK_PEN );
+            dc.DrawLine( horizX+13, y, horizX+18, y );
+
+            if (!item->IsExpanded())
+            {
+                dc.DrawLine( horizX+15, y-2, horizX+15, y+3 );
+            }
+        }
+
+        if (item->HasHilight())
+        {
+            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( *wxBLACK_PEN );
+            dc.SetTextForeground( *wxBLACK );
+            dc.SetBrush( *wxWHITE_BRUSH );
+        }
+        else
+        {
+            dc.SetBrush( *wxWHITE_BRUSH );
+            dc.SetPen( *wxTRANSPARENT_PEN );
 
 
-  dc.DrawLine( horizX+15, oldY+5, horizX+15, semiOldY );
+            PaintItem(item, dc);
+
+            dc.SetPen( *wxBLACK_PEN );
+        }
+    }
+
+    if (item->IsExpanded())
+    {
+        int semiOldY = y;
+
+        wxArrayTreeItems& children = item->GetChildren();
+        size_t count = children.Count();
+        for ( size_t n = 0; n < count; n++ )
+        {
+            y += m_lineHeight;
+            semiOldY = y;
+            PaintLevel( children[n], dc, level+1, y );
+        }
+
+        // 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)
+            dc.DrawLine( horizX+15, oldY+5, horizX+15, semiOldY );
+    }
 }
 
 }
 
-void wxTreeCtrl::OnPaint( const wxPaintEvent &WXUNUSED(event) )
+// -----------------------------------------------------------------------------
+// wxWindows callbacks
+// -----------------------------------------------------------------------------
+
+void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
 {
-  if (!m_anchor) return;
+    if ( !m_anchor )
+        return;
 
 
-  wxPaintDC dc(this);
-  PrepareDC( dc );
+    wxPaintDC 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;
-  PaintLevel( m_anchor, dc, 0, y );
+    int y = m_lineHeight / 2 + 2;
+    PaintLevel( m_anchor, dc, 0, y );
 }
 
 }
 
-void wxTreeCtrl::OnSetFocus( const wxFocusEvent &WXUNUSED(event) )
+void wxTreeCtrl::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
 {
-  m_hasFocus = TRUE;
-  if (m_current) RefreshLine( m_current );
+    m_hasFocus = TRUE;
+
+    if (m_current) RefreshLine( m_current );
 }
 
 }
 
-void wxTreeCtrl::OnKillFocus( const wxFocusEvent &WXUNUSED(event) )
+void wxTreeCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {
 {
-  m_hasFocus = FALSE;
-  if (m_current) RefreshLine( m_current );
+    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)
+    {
+        event.Skip();
+        return;
+    }
+
+    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_current );
+                if (!prev)
+                {
+                    prev = GetParent( m_current );
+                   if (prev)
+                   {
+                        long cockie = 0;
+                        wxTreeItemId current = m_current;
+                        if (current == GetFirstChild( prev, cockie ))
+                        {
+                            // otherwise we return to where we came from
+                            SelectItem( prev );
+                            EnsureVisible( prev );
+                            break;
+                       }
+                    }
+                }
+                if (prev)
+                {
+                    while ( IsExpanded(prev) && HasChildren(prev) )
+                    {
+                        wxTreeItemId child = GetLastChild(prev);
+                        if ( child )
+                        {
+                            prev = child;
+                        }
+                    }
+
+                    SelectItem( prev );
+                    EnsureVisible( prev );
+                }
+            }
+            break;
+
+            // left arrow goes to the parent
+        case WXK_LEFT:
+            {
+                wxTreeItemId prev = GetParent( m_current );
+                if (prev)
+                {
+                    EnsureVisible( prev );
+                    SelectItem( prev );
+                }
+            }
+            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_current) && HasChildren(m_current))
+                {
+                    long cookie = 0;
+                    wxTreeItemId child = GetFirstChild( m_current, cookie );
+                    SelectItem( child );
+                    EnsureVisible( child );
+                }
+                else
+                {
+                    wxTreeItemId next = GetNextSibling( m_current );
+                    if (next == 0)
+                    {
+                        wxTreeItemId current = m_current;
+                        while (current && !next)
+                        {
+                            current = GetParent( current );
+                            if (current) next = GetNextSibling( current );
+                        }
+                    }
+                    if (next != 0)
+                    {
+                        SelectItem( next );
+                        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 );
+                }
+            }
+            break;
+
+            // <Home> selects the root item
+        case WXK_HOME:
+            {
+                wxTreeItemId prev = GetRootItem();
+                if (prev)
+                {
+                    EnsureVisible( prev );
+                    SelectItem( prev );
+                }
+            }
+            break;
+
+        default:
+            event.Skip();
+    }
 }
 
 }
 
-void wxTreeCtrl::OnMouse( const wxMouseEvent &event )
+wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& WXUNUSED(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 );
 
 
-  wxClientDC dc(this);
-  PrepareDC(dc);
-  long x = dc.DeviceToLogicalX( (long)event.GetX() );
-  long y = dc.DeviceToLogicalY( (long)event.GetY() );
+    bool onButton = FALSE;
+    return m_anchor->HitTest( wxPoint(x, y), onButton );
+}
 
 
-  int flag = 0;
-  long id = HitTest( wxPoint(x,y), flag );
-  if (id == -1)
-    return;
-  wxGenericTreeItem *item = FindItem( id );
+void wxTreeCtrl::OnMouse( wxMouseEvent &event )
+{
+    if (!event.LeftIsDown()) m_dragCount = 0;
 
 
-  if (!item) return;
-  if ((flag != wxTREE_HITTEST_ONITEMBUTTON) &&
-      (flag != wxTREE_HITTEST_ONITEMLABEL)) return;
+    if ( !(event.LeftDown() || event.LeftDClick() || event.Dragging()) ) return;
 
 
-  SelectItem(item);
+    if ( !m_anchor ) return;
 
 
-  if (event.LeftDClick())
-    m_current->SendKeyDown( this );
+    wxClientDC dc(this);
+    PrepareDC(dc);
+    long x = dc.DeviceToLogicalX( (long)event.GetX() );
+    long y = dc.DeviceToLogicalY( (long)event.GetY() );
 
 
-  if (flag == wxTREE_HITTEST_ONITEMBUTTON)
-  {
-    ExpandItem( item->m_itemId, wxTREE_EXPAND_TOGGLE );
-    return;
-  }
+    bool onButton = FALSE;
+    wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), onButton );
+
+    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 (!IsSelected(item))
+        SelectItem(item);  /* we dont support multiple selections, BTW */
+
+    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 );
+    }
+
+    if (onButton)
+    {
+        Toggle( item );
+    }
 }
 
 }
 
-void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
+void wxTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
 {
 {
-  int horizX = level*m_indent;
+    /* after all changes have been done to the tree control,
+     * we actually redraw the tree when everything is over */
 
 
-  item->m_x = horizX+33;
-  item->m_y = y-m_lineHeight/3-2;
-  item->m_height = m_lineHeight;
+    if (!m_dirty)
+        return;
 
 
-  if (item->NumberOfVisibleChildren() == 0) return;
+    m_dirty = FALSE;
 
 
-  wxNode *node = item->m_children.First();
-  while (node)
-  {
-    wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();
+    CalculatePositions();
 
 
-    y += m_lineHeight;
-    CalculateLevel( child, dc, level+1, y );
+    AdjustMyScrollbars();
+}
 
 
-    node = node->Next();
-  }
+// -----------------------------------------------------------------------------
+
+void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
+{
+    int horizX = level*m_indent;
+
+    item->SetX( horizX+33 );
+    item->SetY( y-m_lineHeight/2 );
+    item->SetHeight( m_lineHeight );
+
+    if ( !item->IsExpanded() )
+    {
+        // we dont need to calculate collapsed branches
+        return;
+    }
+
+    wxArrayTreeItems& children = item->GetChildren();
+    size_t count = children.Count();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        y += m_lineHeight;
+        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 = m_lineHeight / 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() - 2 );
+    rect.width = 1000;
+    rect.height = dc.GetCharHeight() + 6;
 
 
+    Refresh( TRUE, &rect );
+}
 
 
wxWidgets (Impactor)