]> 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
Visible functions implemented
[wxWidgets.git] / src / generic / treectrl.cpp
diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 0a375375e7f68cc8aedfb21cab9412bb0ddb7df3..d12636c5b726429022b4047781ed006ef9a90cf6 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -1,754 +1,835 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
-// Id:
+// 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
 /////////////////////////////////////////////////////////////////////////////
 
 // 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
 
 #include "wx/treectrl.h"
 #include "wx/settings.h"
 #endif
 
 #include "wx/treectrl.h"
 #include "wx/settings.h"
+#include "wx/log.h"
+#include "wx/intl.h"
+#include "wx/dynarray.h"
+#include "wx/dcclient.h"
 
 
-//-----------------------------------------------------------------------------
-// wxTreeItem
-//-----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+// array types
+// -----------------------------------------------------------------------------
 
 
-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 );
+
+  inline ~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; }
+
+  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
+  void Reset();
+
+  // get count of all children (and grand children and ...) of this item
+  size_t GetTotalNumberOfChildren() 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(); }
+
+private:
+  wxString            m_text;
+
+  int                 m_image,
+                      m_selImage;
+
+  wxTreeItemData     *m_data;
+  
+  // @@ probably should use bitfields to save size
+  bool                m_isCollapsed,
+                      m_hasHilight,   // same as focused
+                      m_hasPlus;      // used for item which doesn't have
+                                      // children but still has a [+] button
+
+  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, wxCommandEvent)
 
 
-wxTreeEvent::wxTreeEvent( wxEventType commandType, int id ) :
-  wxCommandEvent( commandType, id )
+wxTreeEvent::wxTreeEvent( wxEventType commandType, int id )
+           : wxCommandEvent( commandType, id )
 {
   m_code = 0;
 {
   m_code = 0;
-  m_oldItem = 0;
-};
+  m_itemOld = (wxGenericTreeItem *)NULL;
+}
 
 
-//-----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // wxGenericTreeItem
 // wxGenericTreeItem
-//-----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+
+wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
+                                     const wxString& text,
+                                     wxDC& dc,
+                                     int image, int selImage,
+                                     wxTreeItemData *data)
+                 : m_text(text)
+{
+  m_image = image;
+  m_selImage = selImage;
+  m_data = data;
+  m_x = m_y = 0;
+  m_xCross = m_yCross = 0;
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxGenericTreeItem,wxObject)
+  m_level = 0;
 
 
-wxGenericTreeItem::wxGenericTreeItem( wxGenericTreeItem *parent )
-{
-  Reset();
-  m_parent = parent;
+  m_isCollapsed = TRUE;
   m_hasHilight = FALSE;
   m_hasHilight = 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;
+  
+  size_t count = m_children.Count();
+  for ( size_t n = 0; n < count; n++ )
+    delete m_children[n];
+}
 
 
-void wxGenericTreeItem::Reset()
+void wxGenericTreeItem::SetText( const wxString &text, wxDC& dc )
 {
 {
-  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 = NULL;
-};
-
-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_text = text;
 
 
-bool wxGenericTreeItem::HasChildren()
-{
-  return m_hasChildren;
-};
+  dc.GetTextExtent( m_text, &m_width, &m_height );
+}
 
 
-bool wxGenericTreeItem::HasPlus()
+void wxGenericTreeItem::Reset()
 {
 {
-  if ( !HasChildren() )
-    return FALSE;
+  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;
 
 
-  return !IsExpanded();
-};
+  m_level = 0;
 
 
-int wxGenericTreeItem::NumberOfVisibleDescendents()
-{
-  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_children.Empty();
+  m_isCollapsed = TRUE;
 
 
-int wxGenericTreeItem::NumberOfVisibleChildren()
-{
-  return m_isCollapsed ? 0 : m_children.Number();
-};
+  m_parent = (wxGenericTreeItem *)NULL;
+}
 
 
-wxGenericTreeItem *wxGenericTreeItem::FindItem( long itemId ) const
+size_t wxGenericTreeItem::GetTotalNumberOfChildren() const
 {
 {
-  if (m_itemId == itemId) return (wxGenericTreeItem*)(this);
-  wxNode *node = m_children.First();
-  while (node)
+  size_t count = m_children.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();
-  };
-  return NULL;
-};
+    total += m_children[n]->GetTotalNumberOfChildren();
+  }
 
 
-void wxGenericTreeItem::AddChild( wxGenericTreeItem *child )
-{
-  m_children.Append( child );
-};
+  return total;
+}
 
 void wxGenericTreeItem::SetCross( int x, int y )
 {
   m_xCross = x;
   m_yCross = y;
 
 void wxGenericTreeItem::SetCross( int x, int y )
 {
   m_xCross = x;
   m_yCross = y;
-};
+}
 
 void wxGenericTreeItem::GetSize( int &x, int &y )
 {
 
 void wxGenericTreeItem::GetSize( int &x, int &y )
 {
-  if (y < m_y + 10) y = m_y +10;
+  // FIXME what does this all mean??
+  if ( y < m_y + 10 ) y = m_y +10;
   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)
+
+  size_t count = m_children.Count();
+  for ( size_t n = 0; n < count; n++ )
   {
   {
-    wxGenericTreeItem *item = (wxGenericTreeItem*)node->Data();
-    item->GetSize( x, y );
-    node = node->Next();
-  };
-};
+    m_children[n]->GetSize( x, y );
+  }
+}
 
 
-long wxGenericTreeItem::HitTest( const wxPoint& point, int &flags )
+wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
+                                               bool &onButton )
 {
 {
-  if (m_parent && ((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))
+    // FIXME why +5?
+    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;
-    };
+      onButton = TRUE;
+      return this;
+    }
+
     if ((point.x > m_x) && (point.x < m_x+m_width))
     {
     if ((point.x > m_x) && (point.x < m_x+m_width))
     {
-      flags = wxTREE_HITTEST_ONITEMLABEL;
-      return m_itemId;
-    };
-    if (point.x > m_x)
-    {
-      flags = wxTREE_HITTEST_ONITEMRIGHT;
-      return m_itemId;
-    };
-    flags = wxTREE_HITTEST_ONITEMINDENT;
-    return m_itemId;
+      onButton = FALSE;
+      return this;
+    }
   }
   else
   {
   }
   else
   {
-    wxNode *node = m_children.First();
-    while (node)
+    if (!m_isCollapsed)
     {
     {
-      wxGenericTreeItem *child = (wxGenericTreeItem*)node->Data();
-      long res = child->HitTest( point, flags );
-      if (res != -1) return res;
-      node = node->Next();
-    };
-  };
-  return -1;
-};
+      size_t count = m_children.Count();
+      for ( size_t n = 0; n < count; n++ )
+      {
+        wxGenericTreeItem *res = m_children[n]->HitTest( point, onButton );
+        if ( res != NULL )
+          return res;
+      }
+    }
+  }
 
 
-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;
-};
+  return NULL;
+}
 
 
-void wxGenericTreeItem::SendKeyDown( wxWindow *target )
-{
-  wxTreeEvent event( wxEVT_COMMAND_TREE_KEY_DOWN, target->GetId() );
-  PrepareEvent( event );
-  event.SetEventObject( target );
-  target->ProcessEvent( event );
-};
+// -----------------------------------------------------------------------------
+// wxTreeCtrl implementation
+// -----------------------------------------------------------------------------
 
 
-void wxGenericTreeItem::SendSelected( wxWindow *target )
+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)
+END_EVENT_TABLE()
+
+// -----------------------------------------------------------------------------
+// construction/destruction
+// -----------------------------------------------------------------------------
+void wxTreeCtrl::Init()
 {
 {
-  wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGED, target->GetId() );
-  PrepareEvent( event );
-  event.SetEventObject( target );
-  target->ProcessEvent( event );
-};
+  m_current =
+  m_anchor = (wxGenericTreeItem *) NULL;
+  m_hasFocus = FALSE;
 
 
-void wxGenericTreeItem::SendDelete( wxWindow *target )
+  m_xScroll = 0;
+  m_yScroll = 0;
+  m_lineHeight = 10;
+  m_indent = 15;
+
+  m_hilightBrush = new wxBrush
+    (
+      wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT),
+      wxSOLID
+    );
+
+  m_imageListNormal =
+  m_imageListState = (wxImageList *) NULL;
+}
+
+bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
+                        const wxPoint& pos, const wxSize& size,
+                        long style, const wxString& name )
 {
 {
-  wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, target->GetId() );
-  PrepareEvent( event );
-  event.SetEventObject( target );
-  target->ProcessEvent( event );
-};
+  Init();
+
+  wxScrolledWindow::Create( parent, id, pos, size, style, name );
 
 
-void wxGenericTreeItem::SendExpand( wxWindow *target )
+  SetBackgroundColour( *wxWHITE );
+  m_dottedPen = wxPen( *wxBLACK, 0, 0 );
+
+  return TRUE;
+}
+
+wxTreeCtrl::~wxTreeCtrl()
 {
 {
-  m_isCollapsed = FALSE;
+  wxDELETE( m_hilightBrush );
+  wxDELETE( m_anchor );
+}
 
 
-  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, target->GetId() );
-  event.SetCode(wxTREE_EXPAND_EXPAND);
-  event.SetEventObject( target );
-  PrepareEvent( event );
-  target->ProcessEvent( event );
+// -----------------------------------------------------------------------------
+// accessors
+// -----------------------------------------------------------------------------
 
 
-  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
-  PrepareEvent( event );
-  target->ProcessEvent( event );
-};
+size_t wxTreeCtrl::GetCount() const
+{
+  return m_anchor == NULL ? 0u : m_anchor->GetTotalNumberOfChildren();
+}
 
 
-void wxGenericTreeItem::SendCollapse( wxWindow *target )
+void wxTreeCtrl::SetIndent(unsigned int indent)
 {
 {
-  m_isCollapsed = TRUE;
+  m_indent = indent;
+  Refresh();
+}
 
 
-  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, target->GetId() );
-  event.SetCode(wxTREE_EXPAND_COLLAPSE);
-  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
+{
+  return item.m_pItem->GetText();
+}
 
 
-void wxGenericTreeItem::SetHilight( bool set )
+int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const
 {
 {
-  m_hasHilight = set;
-};
+  return item.m_pItem->GetImage();
+}
 
 
-bool wxGenericTreeItem::HasHilight()
+int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
 {
 {
-  return m_hasHilight;
-};
+  return item.m_pItem->GetSelectedImage();
+}
 
 
-//-----------------------------------------------------------------------------
-// wxTreeCtrl
-//-----------------------------------------------------------------------------
+wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
+{
+  return item.m_pItem->GetData();
+}
 
 
-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl,wxScrolledWindow
-)
+void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
+{
+  wxClientDC dc(this);
+  item.m_pItem->SetText(text, dc);
+}
 
 
-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::SetItemImage(const wxTreeItemId& item, int image)
+{
+  item.m_pItem->SetImage(image);
+}
 
 
-wxTreeCtrl::wxTreeCtrl()
+void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
 {
 {
-  m_current = NULL;
-  m_anchor = NULL;
-  m_hasFocus = FALSE;
-  m_xScroll = 0;
-  m_yScroll = 0;
-  m_lastId = 0;
-  m_lineHeight = 10;
-  m_indent = 15;
-  m_isCreated = FALSE;
-  m_dc = NULL;
-  m_hilightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
-};
+  item.m_pItem->SetSelectedImage(image);
+}
 
 
-wxTreeCtrl::wxTreeCtrl(wxWindow *parent, const wxWindowID id,
-            const wxPoint& pos,
- const wxSize& size,
-            long style, const wxString& name )
+void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
 {
 {
-  m_current = NULL;
-  m_anchor = NULL;
-  m_hasFocus = FALSE;
-  m_xScroll = 0;
-  m_yScroll = 0;
-  m_lastId = 0;
-  m_lineHeight = 10;
-  m_indent = 15;
-  m_isCreated = FALSE;
-  m_dc = NULL;
-  m_hilightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
-  Create( parent, id, pos, size, style, name );
-};
+  item.m_pItem->SetData(data);
+}
 
 
-wxTreeCtrl::~wxTreeCtrl()
+void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
 {
 {
-  if (m_dc) delete m_dc;
-};
+  item.m_pItem->SetHasPlus(has);
+}
+
+// -----------------------------------------------------------------------------
+// item status inquiries
+// -----------------------------------------------------------------------------
 
 
-bool wxTreeCtrl::Create(wxWindow *parent, const wxWindowID id,
-            const wxPoint& pos,
- const wxSize& size,
-            long style
-, const wxString& name )
+bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
 {
 {
-  wxScrolledWindow::Create( parent, id, pos, size, style, name );
-  SetBackgroundColour( *wxWHITE );
-  m_dottedPen = wxPen( *wxBLACK, 0, 0 );
+  wxFAIL_MSG("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();
-};
+  return !item.m_pItem->GetChildren().IsEmpty();
+}
+
+bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
+{
+  return item.m_pItem->IsExpanded();
+}
+
+bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
+{
+  return item.m_pItem->HasHilight();
+}
+
+// -----------------------------------------------------------------------------
+// navigation
+// -----------------------------------------------------------------------------
+
+wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+
+  return item.m_pItem->GetParent();
+}
+
+wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const
+{
+  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+
+  cookie = 0;
+  return GetNextChild(item, cookie);
+}
+
+wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const
+{
+  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
 
 
-long wxTreeCtrl::InsertItem( long parent, const wxString& label, int image,
-      int selImage, long WXUNUSED(insertAfter) )
+  return item.m_pItem->GetChildren().Item(cookie++);
+}
+
+wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
 {
 {
-  wxGenericTreeItem *p = NULL;
-  if (parent == 0)
+  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+
+  wxGenericTreeItem *i = item.m_pItem;
+  wxGenericTreeItem *parent = i->GetParent();
+  if ( parent == NULL )
   {
   {
-    if (m_anchor) return -1;
+    // root item doesn't have any siblings
+    return NULL;
   }
   }
-  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;
-  };
+  
+  wxArrayTreeItems& siblings = parent->GetChildren();
+  int index = siblings.Index(i);
+  wxASSERT( index != NOT_FOUND ); // I'm not a child of my parent?
 
 
-  wxClientDC dc(this);
-  wxGenericTreeItem *new_child = new wxGenericTreeItem( p, item, &dc );
-  if (p)
-    p->AddChild( new_child );
-  else
-    m_anchor = new_child;
+  size_t n = (size_t)(index + 1);
+  return n == siblings.Count() ? (wxGenericTreeItem*)NULL : siblings[n];
+}
 
 
-  if (p)
+wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+
+  wxGenericTreeItem *i = item.m_pItem;
+  wxGenericTreeItem *parent = i->GetParent();
+  if ( parent == NULL )
   {
   {
-    CalculatePositions();
+    // root item doesn't have any siblings
+    return NULL;
+  }
+  
+  wxArrayTreeItems& siblings = parent->GetChildren();
+  int index = siblings.Index(i);
+  wxASSERT( index != NOT_FOUND ); // I'm not a child of my parent?
 
 
-    int ch = 0;
-    GetClientSize( NULL, &ch );
+  return index == 0 ? (wxGenericTreeItem*)NULL : siblings[(size_t)(index - 1)];
+}
 
 
-    wxRectangle rect;
-    rect.x = 0; rect.y = 0;
-    rect.width = 10000; rect.height = ch;
+wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
+{
+  wxFAIL_MSG("not implemented");
 
 
-    PrepareDC( dc );
-    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 NULL;
+}
 
 
-    long doX = 0;
-    long doY = 0;
-    dc.GetDeviceOrigin( &doX, &doY );
-    rect.height = ch-rect.y-doY;
+wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
 
 
-    AdjustMyScrollbars();
+  wxFAIL_MSG("not implemented");
 
 
-    if (rect.height > 0) Refresh( FALSE, &rect);
-  }
-  else
-  {
-    AdjustMyScrollbars();
+  return NULL;
+}
 
 
-    Refresh();
-  };
+wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
 
 
-  return m_lastId;
-};
+  wxFAIL_MSG("not implemented");
+
+  return NULL;
+}
 
 
-long wxTreeCtrl::InsertItem( long parent, wxTreeItem &info, long WXUNUSED(insertAfter) )
+// -----------------------------------------------------------------------------
+// operations
+// -----------------------------------------------------------------------------
+
+wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parentId,
+                                      size_t previous,
+                                      const wxString& text,
+                                      int image, int selImage,
+                                      wxTreeItemData *data)
 {
 {
-  int oldMask = info.m_mask;
-  wxGenericTreeItem *p = 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)
+  wxGenericTreeItem *parent = parentId.m_pItem;
+  if ( !parent )
   {
   {
-    m_lastId++;
-    info.m_itemId = m_lastId;
-    info.m_mask |= wxTREE_MASK_HANDLE;
-    ret = m_lastId;
+    // should we give a warning here?
+    return AddRoot(text, image, selImage, data);
   }
   }
-  else
-  {
-    ret = info.m_itemId;
-  };
-
+  
   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;
+  wxGenericTreeItem *item = new wxGenericTreeItem(parent,
+                                                  text, dc,
+                                                  image, selImage,
+                                                  data);
 
 
-  if (p)
+  if ( data != NULL )
   {
   {
-    CalculatePositions();
+    data->m_pItem = item;
+  }
 
 
-    int ch = 0;
-    GetClientSize( NULL, &ch );
+  parent->Insert( item, previous );
 
 
-    wxRectangle rect;
-    rect.x = 0; rect.y = 0;
-    rect.width = 10000; rect.height = ch;
+  CalculatePositions();
 
 
-    PrepareDC( dc );
-    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 );
-    };
+  int cw, ch;
+  GetClientSize( &cw, &ch );
 
 
-    long doX = 0;
-    long doY = 0;
-    dc.GetDeviceOrigin( &doX, &doY );
-    rect.height = ch-rect.y-doY;
+  PrepareDC( dc );
 
 
-    AdjustMyScrollbars();
+  wxRectangle rect;
+  rect.x = dc.LogicalToDeviceX( 0 ); 
+  rect.y = 0;
+  rect.width = 10000; // @@@ not very elegant...
+  rect.height = ch;
 
 
-    if (rect.height > 0) Refresh( FALSE, &rect);
+  if ( previous != 0 )
+  {
+    rect.y = dc.LogicalToDeviceY( parent->GetChildren().Item(previous)->GetY() );
   }
   }
-  else
+  else // it's the 1st child
   {
   {
-    AdjustMyScrollbars();
+    rect.y = dc.LogicalToDeviceY( parent->GetY() );
+  }
 
 
-    Refresh();
-  };
+  AdjustMyScrollbars();
 
 
-  info.m_mask = oldMask;
-  return ret;
-};
+  if ( rect.height > 0 )
+    Refresh( FALSE, &rect );
+
+  return item;
+}
 
 
-bool wxTreeCtrl::ExpandItem( long item, int action )
+wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
+                                 int image, int selImage,
+                                 wxTreeItemData *data)
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i)
-    return FALSE;
+  wxCHECK_MSG( !m_anchor, NULL, "tree can have only one root" );
 
 
-  switch (action)
+  wxClientDC dc(this);
+  m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc,
+                                   image, selImage, data);
+  if ( data != NULL )
   {
   {
-    case wxTREE_EXPAND_EXPAND:
-    {
-      i->SendExpand( this );
-      break;
-    }
+    data->m_pItem = m_anchor;
+  }
 
 
-    case wxTREE_EXPAND_COLLAPSE_RESET:
-    case wxTREE_EXPAND_COLLAPSE:
-    {
-      wxNode *node = i->m_children.First();
-      while (node)
-      {
-        wxGenericTreeItem *child = (wxGenericTreeItem*)node->Data();
-#if 0 // VZ: don't delete items when the branch is collapsed
-        child->SendDelete( this );
-        delete node;
-        node = i->m_children.First();
-#else
-        if ( child->IsExpanded() )
-          ExpandItem( child->m_itemId, wxTREE_EXPAND_COLLAPSE );
-        node = node->Next();
-#endif
-      };
+  AdjustMyScrollbars();
+  Refresh();
 
 
-      i->SendCollapse( this );
-      break;
-    }
+  return m_anchor;
+}
 
 
-    case wxTREE_EXPAND_TOGGLE:
-    {
-      if ( i->IsExpanded() )
-        ExpandItem( item, wxTREE_EXPAND_COLLAPSE );
-      else
-        ExpandItem( item, wxTREE_EXPAND_EXPAND );
-      return TRUE;
-    }
-  };
+wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent,
+                                     const wxString& text,
+                                     int image, int selImage,
+                                     wxTreeItemData *data)
+{
+  return DoInsertItem(parent, 0u, text, image, selImage, data);
+}
 
 
-  int cw = 0;
-  int ch = 0;
-  GetClientSize( &cw, &ch );
-  wxRect rect;
-  rect.x = 0;
-  rect.width = cw;
-  wxClientDC dc(this);
-  PrepareDC(dc);
-  rect.y = dc.LogicalToDeviceY( i->m_y );
+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);
+  }
 
 
-  long doY = 0;
-  dc.GetDeviceOrigin( NULL, &doY );
-  rect.height = ch-rect.y-doY;
-  Refresh( TRUE, &rect );
+  int index = parent->GetChildren().Index(idPrevious.m_pItem);
+  wxASSERT_MSG( index != NOT_FOUND,
+                "previous item in wxTreeCtrl::InsertItem() is not a sibling" );
+  return DoInsertItem(parentId, (size_t)index, text, image, selImage, data);
+}
 
 
-  AdjustMyScrollbars();
+wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parentId,
+                                    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);
+  }
 
 
-  return TRUE;
-};
+  return DoInsertItem(parent, parent->GetChildren().Count(), text,
+                      image, selImage, data);
+}
 
 
-bool wxTreeCtrl::DeleteAllItems()
+void wxTreeCtrl::Delete(const wxTreeItemId& itemId)
 {
 {
-  delete m_anchor;
-  m_anchor = NULL;
+  wxGenericTreeItem *item = itemId.m_pItem;
+
+  delete item;
+
   Refresh();
   Refresh();
-  return TRUE;
-};
+}
 
 
-bool wxTreeCtrl::GetItem( wxTreeItem &info ) const
+void wxTreeCtrl::DeleteAllItems()
 {
 {
-  wxGenericTreeItem *i = FindItem( info.m_itemId );
-  if (!i) return FALSE;
-  i->GetItem( info );
-  return TRUE;
-};
+  if ( m_anchor )
+  {
+    delete m_anchor;
+    m_anchor = NULL;
+
+    Refresh();
+  }
+}
 
 
-long wxTreeCtrl::GetItemData( long item ) const
+void wxTreeCtrl::Expand(const wxTreeItemId& itemId)
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return 0;
-  return i->m_data;
-};
+  wxGenericTreeItem *item = itemId.m_pItem;
 
 
-wxString wxTreeCtrl::GetItemText( long item ) const
+  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();
+
+  RefreshSubtree(item);
+
+  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
+  ProcessEvent( event );
+}
+
+void wxTreeCtrl::Collapse(const wxTreeItemId& itemId)
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return "";
-  return i->m_text;
-};
+  wxGenericTreeItem *item = itemId.m_pItem;
 
 
-int wxTreeCtrl::GetItemImage(long item) const
+  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();
+
+  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 );
+}
+
+void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item)
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  return i == 0 ? -1 : i->GetImage();
+  Collapse(item);
+  Delete(item);
 }
 
 }
 
-long wxTreeCtrl::GetParent( long item ) const
+void wxTreeCtrl::Toggle(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;
 
 
-long wxTreeCtrl::GetRootItem() const
+  if ( item->IsExpanded() )
+    Collapse(itemId);
+  else
+    Expand(itemId);
+}
+
+void wxTreeCtrl::Unselect()
 {
 {
-  if (m_anchor) return m_anchor->m_itemId;
-  return -1;
-};
+  if ( m_current )
+  {
+    m_current->SetHilight( FALSE );
+    RefreshLine( m_current );
+  }
+}
 
 
-long wxTreeCtrl::GetSelection() const
+void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId)
 {
 {
-  return 0;
-};
+  wxGenericTreeItem *item = itemId.m_pItem;
 
 
-bool wxTreeCtrl::SelectItem( long WXUNUSED(item) ) const
+  if ( m_current != item )
+  {
+    wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() );
+    event.m_item = item;
+    event.m_itemOld = m_current;
+    event.SetEventObject( this );
+    if ( 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);
+    ProcessEvent( event );
+  }
+}
+
+void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 {
 {
-  return FALSE;
-};
+  wxFAIL_MSG("not implemented");
+}
 
 
-bool wxTreeCtrl::ItemHasChildren( long item ) const
+void wxTreeCtrl::ScrollTo(const wxTreeItemId& item)
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return FALSE;
-  return i->m_hasChildren;
-};
+  wxFAIL_MSG("not implemented");
+}
 
 
-void wxTreeCtrl::SetIndent( int indent )
+wxTextCtrl *wxTreeCtrl::EditLabel(const wxTreeItemId& item,
+                      wxClassInfo* textCtrlClass)
 {
 {
-  m_indent = indent;
-  Refresh();
-};
+  wxFAIL_MSG("not implemented");
 
 
-int wxTreeCtrl::GetIndent() const
+  return NULL;
+}
+
+wxTextCtrl *wxTreeCtrl::GetEditControl() const
 {
 {
-  return m_indent;
-};
+  wxFAIL_MSG("not implemented");
+
+  return NULL;
+}
 
 
-bool wxTreeCtrl::SetItem( wxTreeItem &info )
+void wxTreeCtrl::EndEditLabel(const wxTreeItemId& item, bool discardChanges)
 {
 {
-  wxGenericTreeItem *i = FindItem( info.m_itemId );
-  if (!i) return FALSE;
-  wxClientDC dc(this);
-  i->SetItem( info, &dc );
-  Refresh();
-  return TRUE;
-};
+  wxFAIL_MSG("not implemented");
+}
 
 
-bool wxTreeCtrl::SetItemData( long item, long data )
+void wxTreeCtrl::SortChildren(const wxTreeItemId& item,
+                              wxTreeItemCmpFunc *cmpFunction)
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return FALSE;
-  i->m_data = data;
-  return TRUE;
-};
+  wxFAIL_MSG("not implemented");
+}
 
 
-bool wxTreeCtrl::SetItemText( long item, const wxString &text )
+// -----------------------------------------------------------------------------
+// images are not currently supported, but we still provide stubs for these
+// functions
+// -----------------------------------------------------------------------------
+wxImageList *wxTreeCtrl::GetImageList() const
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if (!i) return FALSE;
-  wxClientDC dc(this);
-  i->SetText( text, &dc );
-  return TRUE;
-};
+    return m_imageListNormal;
+}
 
 
-void wxTreeCtrl::SetItemImage(long item, int image, int imageSel) const
+wxImageList *wxTreeCtrl::GetStateImageList() const
 {
 {
-  wxGenericTreeItem *i = FindItem( item );
-  if ( i != 0 ) {
-    i->SetImage(image);
-    i->SetSelectedImage(imageSel);
-  }
+    return m_imageListState;
 }
 
 }
 
-long wxTreeCtrl::HitTest( const wxPoint& point, int &flags )
+void wxTreeCtrl::SetImageList(wxImageList *imageList)
 {
 {
-  flags = 0;
-  if (!m_anchor) return -1;
-  return m_anchor->HitTest( point, flags );
-};
+    m_imageListNormal = imageList;
+}
 
 
+void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
+{
+    m_imageListState = imageList;
+}
+
+// -----------------------------------------------------------------------------
+// helpers
+// -----------------------------------------------------------------------------
 void wxTreeCtrl::AdjustMyScrollbars()
 {
   if (m_anchor)
 void wxTreeCtrl::AdjustMyScrollbars()
 {
   if (m_anchor)
@@ -764,204 +845,201 @@ void wxTreeCtrl::AdjustMyScrollbars()
   else
   {
     SetScrollbars( 0, 0, 0, 0 );
   else
   {
     SetScrollbars( 0, 0, 0, 0 );
-  };
-};
+  }
+}
 
 
-void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
+void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
 {
 {
-  int horizX = level*m_indent+10;
-  int oldY = y;
-  wxNode *node = item->m_children.First();
-  while (node)
-  {
-    wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();
-    dc.SetPen( m_dottedPen );
+  int horizX = level*m_indent;
 
 
-    child->SetCross( horizX+15, y );
+  item->SetX( horizX+33 );
+  item->SetY( y-m_lineHeight/3 );
+  item->SetHeight( m_lineHeight );
 
 
-    if (!node->Next())
-    {
-      if (level != 0) oldY -= (m_lineHeight-5);
-      dc.DrawLine( horizX, oldY, horizX, y );
-    };
+  item->SetCross( horizX+15, y );
 
 
-    child->m_x = horizX+33;
-    child->m_y = y-m_lineHeight/3;
-    child->m_height = m_lineHeight;
+  int oldY = y;
 
 
-    if (IsExposed( 0, child->m_y-2, 10000, m_lineHeight+4 ))
-    {
-      int startX = horizX,
-          endX = horizX + 10;
+  int exposed_x = dc.LogicalToDeviceX( 0 );
+  int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 );
+  
+  if (IsExposed( exposed_x, exposed_y, 1000, m_lineHeight+4 ))
+  {
+    int startX = horizX;
+    int endX = horizX + 10;
 
 
-      if (!(node->Previous()) && (level == 0))
-        startX -= 10;
-      if (!child->HasChildren())
-        endX += 20;
-      dc.DrawLine( startX, y, endX, y );
+    if (!item->HasChildren()) endX += 20;
+    
+    dc.DrawLine( startX, y, endX, y );
 
 
-      if (child->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+17, y );
-        if (child->HasPlus())
-          dc.DrawLine( horizX+15, y-2, horizX+15, y+2 );
-      };
+    if (item->HasPlus())
+    {
+      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->IsExpanded())
+        dc.DrawLine( horizX+15, y-2, horizX+15, y+3 );
+    }
 
 
-      if (child->HasHilight())
+    if (item->HasHilight())
+    {
+      dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
+      dc.SetBrush( *m_hilightBrush );
+      long tw, th;
+      dc.GetTextExtent( item->GetText(), &tw, &th );
+      if (m_hasFocus)
       {
       {
-        dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
-#if 0 // VZ: this code leaves horizontal stripes when item is unselected
-        dc.SetBrush( *m_hilightBrush );
-        if (m_hasFocus)
-          dc.SetPen( wxBLACK_PEN );
-        else
-          dc.SetPen( wxTRANSPARENT_PEN );
-        long tw, th;
-        dc.GetTextExtent( child->m_text, &tw, &th );
-        dc.DrawRectangle( child->m_x-2, child->m_y-2, tw+4, th+4 );
-#else
-        int modeOld = dc.GetBackgroundMode();
-        dc.SetTextBackground( *wxBLACK );
-        dc.SetBackgroundMode(wxSOLID);
-#endif // 0
-
-        dc.DrawText( child->m_text, child->m_x, child->m_y );
-
-#if 0 // VZ: same as above
         dc.SetPen( *wxBLACK_PEN );
         dc.SetPen( *wxBLACK_PEN );
-#else
-        dc.SetBackgroundMode(modeOld);
-        dc.SetTextBackground( *wxWHITE );
-        dc.SetBrush( *wxWHITE_BRUSH );
-#endif
-        dc.SetTextForeground( *wxBLACK );
+        dc.DrawRectangle( item->GetX()-2, item->GetY()-2, tw+4, th+4 );
       }
       else
       }
       else
-        dc.DrawText( child->m_text, child->m_x, child->m_y );
-    };
+      {
+        dc.SetPen( *wxTRANSPARENT_PEN );
+        dc.DrawRectangle( item->GetX()-2, item->GetY()-2, tw+4, th+4 );
+      }
+      dc.DrawText( item->GetText(), item->GetX(), item->GetY() );
 
 
+      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->GetText(), &tw, &th );
+      dc.DrawRectangle( item->GetX()-2, item->GetY()-2, tw+4, th+4 );
+      dc.DrawText( item->GetText(), item->GetX(), item->GetY() );
+      dc.SetPen( *wxBLACK_PEN );
+    }
+  }
+
+  if ( !item->IsExpanded() )
+    return;
+
+  int semiOldY = y;
+
+  wxArrayTreeItems& children = item->GetChildren();
+  size_t count = children.Count();
+  for ( size_t n = 0; n < count; n++ )
+  {
     y += m_lineHeight;
     y += m_lineHeight;
-    if ( child->IsExpanded() && child->NumberOfVisibleChildren() > 0)
-      PaintLevel( child, dc, level+1, y );
-    node = node->Next();
-  };
-};
+    semiOldY = y;
+
+    PaintLevel( children[n], dc, level+1, y );
+  }
+
+  dc.DrawLine( horizX+15, oldY+5, horizX+15, semiOldY );
+}
+
+// -----------------------------------------------------------------------------
+// wxWindows callbacks
+// -----------------------------------------------------------------------------
 
 void wxTreeCtrl::OnPaint( const wxPaintEvent &WXUNUSED(event) )
 {
 
 void wxTreeCtrl::OnPaint( const wxPaintEvent &WXUNUSED(event) )
 {
-  if (!m_anchor) return;
+  if ( !m_anchor )
+    return;
 
 
-  if (!m_dc)
-  {
-    m_dc = new wxPaintDC(this);
-    PrepareDC( *m_dc );
-  };
+  wxPaintDC dc(this);
+  PrepareDC( dc );
 
 
-  m_dc->SetFont( wxSystemSettings::GetSystemFont( wxSYS_SYSTEM_FONT ) );
+  dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_SYSTEM_FONT ) );
 
 
-  m_dc->SetPen( m_dottedPen );
-  m_lineHeight = (int)(m_dc->GetCharHeight() + 4);
+  dc.SetPen( m_dottedPen );
+  m_lineHeight = (int)(dc.GetCharHeight() + 4);
 
   int y = m_lineHeight / 2 + 2;
 
   int y = m_lineHeight / 2 + 2;
-  PaintLevel( m_anchor, *m_dc, 0, y );
-};
+  PaintLevel( m_anchor, dc, 0, y );
+}
 
 void wxTreeCtrl::OnSetFocus( const wxFocusEvent &WXUNUSED(event) )
 {
   m_hasFocus = TRUE;
 
 void wxTreeCtrl::OnSetFocus( const wxFocusEvent &WXUNUSED(event) )
 {
   m_hasFocus = TRUE;
-  if (m_current) RefreshLine( m_current );
-};
+  if ( m_current )
+    RefreshLine( m_current );
+}
 
 void wxTreeCtrl::OnKillFocus( const wxFocusEvent &WXUNUSED(event) )
 {
   m_hasFocus = FALSE;
 
 void wxTreeCtrl::OnKillFocus( const wxFocusEvent &WXUNUSED(event) )
 {
   m_hasFocus = FALSE;
-  if (m_current) RefreshLine( m_current );
-};
+  if ( m_current )
+    RefreshLine( m_current );
+}
 
 void wxTreeCtrl::OnChar( wxKeyEvent &event )
 {
 
 void wxTreeCtrl::OnChar( wxKeyEvent &event )
 {
+  // TODO process '+', '-' (expand/collapse branch) and cursor keys
   event.Skip();
   event.Skip();
-};
+}
 
 void wxTreeCtrl::OnMouse( const wxMouseEvent &event )
 {
 
 void wxTreeCtrl::OnMouse( const wxMouseEvent &event )
 {
-  if (!event.LeftDown() &&
-      !event.LeftDClick()) return;
+  if ( !(event.LeftDown() || event.LeftDClick()) )
+    return;
+
+  if ( !m_anchor )
+    return;
 
   wxClientDC dc(this);
   PrepareDC(dc);
   long x = dc.DeviceToLogicalX( (long)event.GetX() );
   long y = dc.DeviceToLogicalY( (long)event.GetY() );
 
 
   wxClientDC dc(this);
   PrepareDC(dc);
   long x = dc.DeviceToLogicalX( (long)event.GetX() );
   long y = dc.DeviceToLogicalY( (long)event.GetY() );
 
-  int flag = 0;
-  long id = HitTest( wxPoint(x,y), flag );
-  if (id == -1)
+  bool onButton = FALSE;
+  wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), onButton );
+  if ( item == NULL )
     return;
     return;
-  wxGenericTreeItem *item = FindItem( id );
 
 
-  if (!item) return;
-  if ((flag != wxTREE_HITTEST_ONITEMBUTTON) &&
-      (flag != wxTREE_HITTEST_ONITEMLABEL)) return;
+  SelectItem(item);
 
 
-  if (m_current != item)
+  if ( event.LeftDClick() )
   {
   {
-    if (m_current)
-    {
-      m_current->SetHilight( FALSE );
-      RefreshLine( m_current );
-    };
-    m_current = item;
-    m_current->SetHilight( TRUE );
-    RefreshLine( m_current );
-    m_current->SendSelected( this );
-  };
-
-  if (event.LeftDClick())
-    m_current->SendKeyDown( this );
+    wxTreeEvent event( wxEVT_COMMAND_TREE_KEY_DOWN, GetId() );
+    event.m_item = item;
+    event.m_code = 0;
+    event.SetEventObject( this );
+    ProcessEvent( event );
+  }
 
 
-  if (flag == wxTREE_HITTEST_ONITEMBUTTON)
+  if ( onButton )
   {
   {
-    ExpandItem( item->m_itemId, wxTREE_EXPAND_TOGGLE );
-    return;
-  };
-};
+    Toggle( item );
+  }
+}
 
 
-void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
+// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
+void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item,
+                                 wxDC &dc,
+                                 int level,
+                                 int &y )
 {
 {
-  int horizX = level*m_indent+10;
-  wxNode *node = item->m_children.First();
-  while (node)
-  {
-    wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();
-    dc.SetPen( m_dottedPen );
-
-    int startX = horizX,
-        endX = horizX + 10;
+  int horizX = level*m_indent;
 
 
-    if (!node->Previous() && (level == 0))
-      startX -= 10;
-    if (!child->HasChildren())
-      endX += 20;
+  item->SetX( horizX+33 );
+  item->SetY( y-m_lineHeight/3-2 );
+  item->SetHeight( m_lineHeight );
 
 
-    child->m_x = horizX+33;
-    child->m_y = y-m_lineHeight/3-2;
-    child->m_height = m_lineHeight;
+  if ( item->IsExpanded() )
+    return;
 
 
+  wxArrayTreeItems& children = item->GetChildren();
+  size_t count = children.Count();
+  for ( size_t n = 0; n < count; n++ )
+  {
     y += m_lineHeight;
     y += m_lineHeight;
-    if ( child->IsExpanded() && child->NumberOfVisibleChildren() > 0 )
-      CalculateLevel( child, dc, level+1, y );
-
-    node = node->Next();
-  };
-};
+    CalculateLevel( children[n], dc, level+1, y );
+  }
+}
 
 void wxTreeCtrl::CalculatePositions()
 {
 
 void wxTreeCtrl::CalculatePositions()
 {
-  if (!m_anchor)
+  if ( !m_anchor )
     return;
 
   wxClientDC dc(this);
     return;
 
   wxClientDC dc(this);
@@ -974,26 +1052,39 @@ void wxTreeCtrl::CalculatePositions()
 
   int y = m_lineHeight / 2 + 2;
   CalculateLevel( m_anchor, dc, 0, y );
 
   int y = m_lineHeight / 2 + 2;
   CalculateLevel( m_anchor, dc, 0, y );
-};
+}
 
 
-wxGenericTreeItem *wxTreeCtrl::FindItem( long itemId ) const
+void wxTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
 {
 {
-  if (!m_anchor) return 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 );
   wxClientDC dc(this);
   PrepareDC( dc );
+
   wxRect rect;
   wxRect rect;
-  rect.x = dc.LogicalToDeviceX( item->m_x-2 );
-  rect.y = dc.LogicalToDeviceY( item->m_y-2 );
+  rect.x = dc.LogicalToDeviceX( item->GetX() - 2 );
+  rect.y = dc.LogicalToDeviceY( item->GetY() - 2 );
   rect.width = 1000;
   rect.width = 1000;
-  rect.height = dc.GetCharHeight()+4;
-  Refresh( TRUE, &rect );
-};
-
+  rect.height = dc.GetCharHeight() + 6;
 
 
+  Refresh( TRUE, &rect );
+}
 
 
wxWidgets (Impactor)