X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d701d432df49b628f79dff9bd10d15fea828e986..d9d61c23a836b4e4f76d117d18d6b9848b915c39:/src/generic/treectrl.cpp

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 432d44d87b..bb316835d7 100644
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -28,12 +28,13 @@
 #pragma hdrstop
 #endif
 
-#include "wx/generic/treectrl.h"
+#include "wx/treectrl.h"
 #include "wx/generic/imaglist.h"
 #include "wx/settings.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/dynarray.h"
+#include "wx/arrimpl.cpp"
 #include "wx/dcclient.h"
 #include "wx/msgdlg.h"
 
@@ -43,7 +44,8 @@
 
 class WXDLLEXPORT wxGenericTreeItem;
 
-WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayTreeItems);
+WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayGenericTreeItems);
+WX_DEFINE_OBJARRAY(wxArrayTreeItemIds);
 
 // -----------------------------------------------------------------------------
 // private classes
@@ -64,14 +66,14 @@ public:
   ~wxGenericTreeItem();
 
   // trivial accessors
-  wxArrayTreeItems& GetChildren() { return m_children; }
+  wxArrayGenericTreeItems& GetChildren() { return m_children; }
 
   const wxString& GetText() const { return m_text; }
   int GetImage() const { return m_image; }
   int GetSelectedImage() const { return m_selImage; }
   wxTreeItemData *GetData() const { return m_data; }
 
-  void SetText( const wxString &text, wxDC& dc );
+  void SetText( const wxString &text );
   void SetImage(int image) { m_image = image; }
   void SetSelectedImage(int image) { m_selImage = image; }
   void SetData(wxTreeItemData *data) { m_data = data; }
@@ -83,11 +85,16 @@ public:
   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; }
 
+  int  GetHeight() const { return m_height; }
+  int  GetWidth()  const { return m_width; }
+
+  void SetHeight(int h) { m_height = h; }
+  void SetWidth(int w) { m_width = w; }
+
+
   wxGenericTreeItem *GetParent() const { return m_parent; }
 
   // operations
@@ -104,12 +111,12 @@ public:
     { m_children.Insert(child, index); }
 
   void SetCross( int x, int y );
-  void GetSize( int &x, int &y );
+  void GetSize( int &x, int &y, const wxTreeCtrl* );
 
   // return the item at given position (or NULL if no item), onButton is TRUE
   // if the point belongs to the item's button, otherwise it lies on the
   // button's label
-  wxGenericTreeItem *HitTest( const wxPoint& point, bool &onButton );
+  wxGenericTreeItem *HitTest( const wxPoint& point, const wxTreeCtrl *, int &flags);
 
   void Expand() { m_isCollapsed = FALSE; }
   void Collapse() { m_isCollapsed = TRUE; }
@@ -142,7 +149,7 @@ private:
   long                m_height, m_width;
   int                 m_xCross, m_yCross;
   int                 m_level;
-  wxArrayTreeItems    m_children;
+  wxArrayGenericTreeItems m_children;
   wxGenericTreeItem  *m_parent;
 };
 
@@ -150,12 +157,77 @@ private:
 // implementation
 // =============================================================================
 
+
+// -----------------------------------------------------------------------------
+// wxTreeRenameTimer (internal)
+// -----------------------------------------------------------------------------
+
+wxTreeRenameTimer::wxTreeRenameTimer( wxTreeCtrl *owner )
+{
+    m_owner = owner;
+}
+
+void wxTreeRenameTimer::Notify()
+{
+    m_owner->OnRenameTimer();
+}
+
+//-----------------------------------------------------------------------------
+// wxTreeTextCtrl (internal)
+//-----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxTreeTextCtrl,wxTextCtrl);
+
+BEGIN_EVENT_TABLE(wxTreeTextCtrl,wxTextCtrl)
+    EVT_CHAR           (wxTreeTextCtrl::OnChar)
+    EVT_KILL_FOCUS     (wxTreeTextCtrl::OnKillFocus)
+END_EVENT_TABLE()
+
+wxTreeTextCtrl::wxTreeTextCtrl( wxWindow *parent, const wxWindowID id,
+    bool *accept, wxString *res, wxTreeCtrl *owner,
+    const wxString &value, const wxPoint &pos, const wxSize &size,
+    int style, const wxValidator& validator, const wxString &name ) :
+  wxTextCtrl( parent, id, value, pos, size, style, validator, name )
+{
+    m_res = res;
+    m_accept = accept;
+    m_owner = owner;
+}
+
+void wxTreeTextCtrl::OnChar( wxKeyEvent &event )
+{
+    if (event.m_keyCode == WXK_RETURN)
+    {
+        (*m_accept) = TRUE;
+        (*m_res) = GetValue();
+        m_owner->OnRenameAccept();
+        if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
+        return;
+    }
+    if (event.m_keyCode == WXK_ESCAPE)
+    {
+        (*m_accept) = FALSE;
+        (*m_res) = "";
+        if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
+        return;
+    }
+    event.Skip();
+}
+
+void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
+{
+    (*m_accept) = FALSE;
+    (*m_res) = "";
+    if (!wxPendingDelete.Member(this)) wxPendingDelete.Append(this);
+}
+
+#define PIXELS_PER_UNIT 10
 // -----------------------------------------------------------------------------
 // wxTreeEvent
 // -----------------------------------------------------------------------------
 
 IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
-
+  
 wxTreeEvent::wxTreeEvent( wxEventType commandType, int id )
            : wxNotifyEvent( commandType, id )
 {
@@ -190,6 +262,10 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
   m_parent = parent;
 
   dc.GetTextExtent( m_text, &m_width, &m_height );
+  // TODO : Add the width of the image
+  // PB   : We don't know which image is shown (image, selImage)
+  //        We don't even know imageList from the treectrl this item belongs to !!!
+  // At this point m_width doesn't mean much, this can be remove !
 }
 
 wxGenericTreeItem::~wxGenericTreeItem()
@@ -197,7 +273,7 @@ wxGenericTreeItem::~wxGenericTreeItem()
   delete m_data;
 
   wxASSERT_MSG( m_children.IsEmpty(),
-                "please call DeleteChildren() before deleting the item" );
+                _T("please call DeleteChildren() before deleting the item") );
 }
 
 void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree)
@@ -218,11 +294,9 @@ void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree)
   m_children.Empty();
 }
 
-void wxGenericTreeItem::SetText( const wxString &text, wxDC& dc )
+void wxGenericTreeItem::SetText( const wxString &text )
 {
   m_text = text;
-
-  dc.GetTextExtent( m_text, &m_width, &m_height );
 }
 
 void wxGenericTreeItem::Reset()
@@ -251,7 +325,7 @@ size_t wxGenericTreeItem::GetChildrenCount(bool recursively) const
     return count;
 
   size_t total = count;
-  for ( size_t n = 0; n < count; n++ )
+  for ( size_t n = 0; n < count; ++n )
   {
     total += m_children[n]->GetChildrenCount();
   }
@@ -265,44 +339,63 @@ void wxGenericTreeItem::SetCross( int x, int y )
   m_yCross = y;
 }
 
-void wxGenericTreeItem::GetSize( int &x, int &y )
+void wxGenericTreeItem::GetSize( int &x, int &y, const wxTreeCtrl *theTree )
 {
-  if ( y < m_y ) y = m_y;
+  int bottomY=m_y+theTree->GetLineHeight(this);
+  if ( y < bottomY ) y = bottomY;
   int width = m_x +  m_width;
-  if (width > x) x = width;
+  if ( x < width ) x = width;
 
   if (IsExpanded())
   {
     size_t count = m_children.Count();
-    for ( size_t n = 0; n < count; n++ )
+    for ( size_t n = 0; n < count; ++n )
     {
-      m_children[n]->GetSize( x, y );
+      m_children[n]->GetSize( x, y, theTree );
     }
   }
 }
 
 wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
-                                               bool &onButton )
+                                               const wxTreeCtrl *theTree,
+                                               int &flags)
 {
-  if ((point.y > m_y) && (point.y < m_y + m_height))
+  if ((point.y > m_y) && (point.y < m_y + theTree->GetLineHeight(this)))
   {
+    if (point.y<m_y+theTree->GetLineHeight(this)/2) flags|=wxTREE_HITTEST_ONITEMUPPERPART;
+    else flags|=wxTREE_HITTEST_ONITEMLOWERPART;
+
     // FIXME why +5?
+    //  Because that is the size of the plus sign, RR
     if ((point.x > m_xCross-5) && (point.x < m_xCross+5) &&
         (point.y > m_yCross-5) && (point.y < m_yCross+5) &&
         (IsExpanded() || HasPlus()))
     {
-      onButton = TRUE;
+      flags|=wxTREE_HITTEST_ONITEMBUTTON;
       return this;
     }
 
-    int w = m_width;
-    if (m_image != -1) w += 20;
-
-    if ((point.x > m_x) && (point.x < m_x+w))
+    if ((point.x >= m_x) && (point.x <= m_x+m_width))
     {
-      onButton = FALSE;
+      int image_w = -1;
+      int image_h;
+
+      // assuming every image (normal and selected ) has the same size !
+      if ((m_image!=-1) && theTree->m_imageListNormal)
+          theTree->m_imageListNormal->GetSize(m_image, image_w, image_h);
+
+      if ((image_w != -1) && (point.x <= m_x + image_w + 1))
+        flags|=wxTREE_HITTEST_ONITEMICON;
+      else
+        flags|=wxTREE_HITTEST_ONITEMLABEL;
+
       return this;
     }
+
+    if (point.x < m_x)         flags|=wxTREE_HITTEST_ONITEMIDENT;
+    if (point.x > m_x+m_width) flags|=wxTREE_HITTEST_ONITEMRIGHT;
+
+    return this;
   }
   else
   {
@@ -311,13 +404,14 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
       size_t count = m_children.Count();
       for ( size_t n = 0; n < count; n++ )
       {
-        wxGenericTreeItem *res = m_children[n]->HitTest( point, onButton );
+        wxGenericTreeItem *res = m_children[n]->HitTest( point, theTree, flags );
         if ( res != NULL )
           return res;
       }
     }
   }
 
+  flags|=wxTREE_HITTEST_NOWHERE;
   return NULL;
 }
 
@@ -339,9 +433,11 @@ END_EVENT_TABLE()
 // -----------------------------------------------------------------------------
 // construction/destruction
 // -----------------------------------------------------------------------------
+
 void wxTreeCtrl::Init()
 {
   m_current =
+  m_key_current =
   m_anchor = (wxGenericTreeItem *) NULL;
   m_hasFocus = FALSE;
   m_dirty = FALSE;
@@ -350,6 +446,7 @@ void wxTreeCtrl::Init()
   m_yScroll = 0;
   m_lineHeight = 10;
   m_indent = 15;
+  m_spacing = 18;
 
   m_hilightBrush = new wxBrush
     (
@@ -361,6 +458,8 @@ void wxTreeCtrl::Init()
   m_imageListState = (wxImageList *) NULL;
 
   m_dragCount = 0;
+  
+  m_renameTimer = new wxTreeRenameTimer( this );
 }
 
 bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
@@ -373,10 +472,13 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
 
   wxScrolledWindow::Create( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name );
 
+#if wxUSE_VALIDATORS
   SetValidator( validator );
+#endif
 
   SetBackgroundColour( *wxWHITE );
-  m_dottedPen = wxPen( *wxBLACK, 0, 0 );
+//  m_dottedPen = wxPen( "grey", 0, wxDOT );
+  m_dottedPen = wxPen( "grey", 0, 0 );
 
   return TRUE;
 }
@@ -386,6 +488,8 @@ wxTreeCtrl::~wxTreeCtrl()
   wxDELETE( m_hilightBrush );
 
   DeleteAllItems();
+  
+  delete m_renameTimer;
 }
 
 // -----------------------------------------------------------------------------
@@ -400,12 +504,20 @@ size_t wxTreeCtrl::GetCount() const
 void wxTreeCtrl::SetIndent(unsigned int indent)
 {
   m_indent = indent;
+  m_dirty = TRUE;
+  Refresh();
+}
+
+void wxTreeCtrl::SetSpacing(unsigned int spacing)
+{
+  m_spacing = spacing;
+  m_dirty = TRUE;
   Refresh();
 }
 
 size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
 {
-  wxCHECK_MSG( item.IsOk(), 0u, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), 0u, _T("invalid tree item") );
 
   return item.m_pItem->GetChildrenCount(recursively);
 }
@@ -416,70 +528,75 @@ size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
 
 wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), "", "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), _T(""), _T("invalid tree item") );
 
   return item.m_pItem->GetText();
 }
 
 int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), -1, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") );
 
   return item.m_pItem->GetImage();
 }
 
 int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), -1, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), -1, _T("invalid tree item") );
 
   return item.m_pItem->GetSelectedImage();
 }
 
 wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), NULL, _T("invalid tree item") );
 
   return item.m_pItem->GetData();
 }
 
 void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
 {
-  wxCHECK_RET( item.IsOk(), "invalid tree item" );
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
 
   wxClientDC dc(this);
   wxGenericTreeItem *pItem = item.m_pItem;
-  pItem->SetText(text, dc);
+  pItem->SetText(text);
+  CalculateSize(pItem, dc);
   RefreshLine(pItem);
 }
 
 void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
 {
-  wxCHECK_RET( item.IsOk(), "invalid tree item" );
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
 
+  wxClientDC dc(this);
   wxGenericTreeItem *pItem = item.m_pItem;
   pItem->SetImage(image);
+  CalculateSize(pItem, dc);
   RefreshLine(pItem);
 }
 
 void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
 {
-  wxCHECK_RET( item.IsOk(), "invalid tree item" );
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
 
+  wxClientDC dc(this);
   wxGenericTreeItem *pItem = item.m_pItem;
   pItem->SetSelectedImage(image);
+  CalculateSize(pItem, dc);
   RefreshLine(pItem);
 }
 
 void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
 {
-  wxCHECK_RET( item.IsOk(), "invalid tree item" );
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
 
   item.m_pItem->SetData(data);
 }
 
 void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
 {
-  wxCHECK_RET( item.IsOk(), "invalid tree item" );
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
 
   wxGenericTreeItem *pItem = item.m_pItem;
   pItem->SetHasPlus(has);
@@ -488,7 +605,7 @@ void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
 
 void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
 {
-  wxCHECK_RET( item.IsOk(), "invalid tree item" );
+  wxCHECK_RET( item.IsOk(), _T("invalid tree item") );
 
   // avoid redrawing the tree if no real change
   wxGenericTreeItem *pItem = item.m_pItem;
@@ -505,35 +622,35 @@ void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
 
 bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const
 {
-  wxFAIL_MSG("not implemented");
+  wxFAIL_MSG(_T("not implemented"));
 
   return TRUE;
 }
 
 bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
 
   return !item.m_pItem->GetChildren().IsEmpty();
 }
 
 bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
 
   return item.m_pItem->IsExpanded();
 }
 
 bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
 
   return item.m_pItem->HasHilight();
 }
 
 bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid tree item") );
 
   return item.m_pItem->IsBold();
 }
@@ -544,14 +661,14 @@ bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
 
 wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
 
   return item.m_pItem->GetParent();
 }
 
 wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const
 {
-  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
 
   cookie = 0;
   return GetNextChild(item, cookie);
@@ -559,9 +676,9 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) c
 
 wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const
 {
-  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
 
-  wxArrayTreeItems& children = item.m_pItem->GetChildren();
+  wxArrayGenericTreeItems& children = item.m_pItem->GetChildren();
   if ( (size_t)cookie < children.Count() )
   {
     return children.Item(cookie++);
@@ -575,15 +692,15 @@ wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) co
 
 wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
 
-  wxArrayTreeItems& children = item.m_pItem->GetChildren();
+  wxArrayGenericTreeItems& children = item.m_pItem->GetChildren();
   return (children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last()));
 }
 
 wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
 
   wxGenericTreeItem *i = item.m_pItem;
   wxGenericTreeItem *parent = i->GetParent();
@@ -593,7 +710,7 @@ wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
     return wxTreeItemId();
   }
 
-  wxArrayTreeItems& siblings = parent->GetChildren();
+  wxArrayGenericTreeItems& siblings = parent->GetChildren();
   int index = siblings.Index(i);
   wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?
 
@@ -603,7 +720,7 @@ wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
 
 wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
 
   wxGenericTreeItem *i = item.m_pItem;
   wxGenericTreeItem *parent = i->GetParent();
@@ -613,7 +730,7 @@ wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
     return wxTreeItemId();
   }
 
-  wxArrayTreeItems& siblings = parent->GetChildren();
+  wxArrayGenericTreeItems& siblings = parent->GetChildren();
   int index = siblings.Index(i);
   wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?
 
@@ -623,25 +740,25 @@ wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
 
 wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
 {
-  wxFAIL_MSG("not implemented");
+  wxFAIL_MSG(_T("not implemented"));
 
   return wxTreeItemId();
 }
 
 wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
 
-  wxFAIL_MSG("not implemented");
+  wxFAIL_MSG(_T("not implemented"));
 
   return wxTreeItemId();
 }
 
 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 {
-  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), _T("invalid tree item") );
 
-  wxFAIL_MSG("not implemented");
+  wxFAIL_MSG(_T("not implemented"));
 
   return wxTreeItemId();
 }
@@ -685,7 +802,7 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
                                  int image, int selImage,
                                  wxTreeItemData *data)
 {
-  wxCHECK_MSG( !m_anchor, wxTreeItemId(), "tree can have only one root" );
+  wxCHECK_MSG( !m_anchor, wxTreeItemId(), _T("tree can have only one root") );
 
   wxClientDC dc(this);
   m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc,
@@ -695,8 +812,8 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
     data->m_pItem = m_anchor;
   }
 
-  AdjustMyScrollbars();
   Refresh();
+  AdjustMyScrollbars();
 
   return m_anchor;
 }
@@ -724,8 +841,8 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parentId,
 
   int index = parent->GetChildren().Index(idPrevious.m_pItem);
   wxASSERT_MSG( index != wxNOT_FOUND,
-                "previous item in wxTreeCtrl::InsertItem() is not a sibling" );
-  return DoInsertItem(parentId, (size_t)index, text, image, selImage, data);
+                _T("previous item in wxTreeCtrl::InsertItem() is not a sibling") );
+  return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);
 }
 
 wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parentId,
@@ -836,7 +953,7 @@ void wxTreeCtrl::Collapse(const wxTreeItemId& itemId)
 
   item->Collapse();
 
-  wxArrayTreeItems& children = item->GetChildren();
+  wxArrayGenericTreeItems& children = item->GetChildren();
   size_t count = children.Count();
   for ( size_t n = 0; n < count; n++ )
   {
@@ -876,36 +993,176 @@ void wxTreeCtrl::Unselect()
   }
 }
 
-void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId)
+void wxTreeCtrl::UnselectAllChildren(wxGenericTreeItem *item)
 {
-  wxGenericTreeItem *item = itemId.m_pItem;
+  item->SetHilight(FALSE);
+  RefreshLine(item);
+
+  if (item->HasChildren())
+    {
+      wxArrayGenericTreeItems& children = item->GetChildren();
+      size_t count = children.Count();
+      for ( size_t n = 0; n < count; ++n )
+        UnselectAllChildren(children[n]);
+    }
+}
+
+void wxTreeCtrl::UnselectAll()
+{
+  UnselectAllChildren(GetRootItem().m_pItem);
+}
+
+// Recursive function !
+// To stop we must have crt_item<last_item
+// Algorithm :
+// Tag all next children, when no more children,
+// Move to parent (not to tag)
+// Keep going... if we found last_item, we stop.
+bool wxTreeCtrl::TagNextChildren(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select)
+{
+    wxGenericTreeItem *parent = crt_item->GetParent();
+
+    if ( parent == NULL ) // This is root item
+      return TagAllChildrenUntilLast(crt_item, last_item, select);
+
+    wxArrayGenericTreeItems& children = parent->GetChildren();
+    int index = children.Index(crt_item);
+    wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?
+
+    size_t count = children.Count();
+    for (size_t n=(size_t)(index+1); n<count; ++n)
+      if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE;
+
+    return TagNextChildren(parent, last_item, select);
+}
+
+bool wxTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxGenericTreeItem *last_item, bool select)
+{
+  crt_item->SetHilight(select);
+  RefreshLine(crt_item);
+
+  if (crt_item==last_item) return TRUE;
+
+  if (crt_item->HasChildren())
+    {
+      wxArrayGenericTreeItems& children = crt_item->GetChildren();
+      size_t count = children.Count();
+      for ( size_t n = 0; n < count; ++n )
+        if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE;
+    }
+
+  return FALSE;
+}
+
+void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *item2)
+{
+  // item2 is not necessary after item1
+  wxGenericTreeItem *first=NULL, *last=NULL;
+
+  // choice first' and 'last' between item1 and item2
+  if (item1->GetY()<item2->GetY())
+    {
+      first=item1;
+      last=item2;
+    }
+  else
+    {
+      first=item2;
+      last=item1;
+    }
+
+  bool select=m_current->HasHilight();
+
+  if (TagAllChildrenUntilLast(first,last,select)) return;
+
+  TagNextChildren(first,last,select);
+}
+
+void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
+                            bool unselect_others,
+                            bool extended_select)
+{
+    wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") );
+
+    bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE);
+
+    //wxCHECK_RET( ( (!unselect_others) && is_single),
+    //           _T("this is a single selection tree") );
+
+    // to keep going anyhow !!!
+    if (is_single)
+    {
+        unselect_others=TRUE;
+        extended_select=FALSE;
+    }
+
+    wxGenericTreeItem *item = itemId.m_pItem;
 
-  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 ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() )
+    // TODO : Here we don't send any selection mode yet !
+
+    if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )
       return;
 
-    if ( m_current )
+    // ctrl press
+    if (unselect_others)
     {
-      m_current->SetHilight( FALSE );
-      RefreshLine( m_current );
+        if (is_single) Unselect(); // to speed up thing
+        else UnselectAll();
     }
 
-    m_current = item;
-    m_current->SetHilight( TRUE );
-    RefreshLine( m_current );
+    // shift press
+    if (extended_select)
+    {
+        if (m_current == NULL) m_current=m_key_current=GetRootItem().m_pItem;
+        // don't change the mark (m_current)
+        SelectItemRange(m_current, item);
+    }
+    else
+    {
+        bool select=TRUE; // the default
+
+        // Check if we need to toggle hilight (ctrl mode)
+        if (!unselect_others)
+          select=!item->HasHilight();
+
+        m_current = m_key_current = item;
+        m_current->SetHilight(select);
+        RefreshLine( m_current );
+    }
 
     event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
     GetEventHandler()->ProcessEvent( event );
-  }
+}
+
+void wxTreeCtrl::FillArray(wxGenericTreeItem *item, wxArrayTreeItemIds &array) const
+{
+  if (item->HasHilight()) array.Add(wxTreeItemId(item));
+
+  if (item->HasChildren())
+    {
+      wxArrayGenericTreeItems& children = item->GetChildren();
+      size_t count = children.Count();
+      for ( size_t n = 0; n < count; ++n )
+        FillArray(children[n],array);
+    }
+}
+
+size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds &array) const
+{
+  array.Empty();
+  FillArray(GetRootItem().m_pItem, array);
+
+  return array.Count();
 }
 
 void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 {
+    if (!item.IsOk()) return;
+
     wxGenericTreeItem *gitem = item.m_pItem;
 
     // first expand all parent branches
@@ -917,13 +1174,24 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
         parent = parent->GetParent();
     }
 
+    if (parent) CalculatePositions();
+
+    ScrollTo(item);
+}
+
+void wxTreeCtrl::ScrollTo(const wxTreeItemId &item)
+{
+    if (!item.IsOk()) return;
+
+    wxGenericTreeItem *gitem = item.m_pItem;
+
     // now scroll to the item
     int item_y = gitem->GetY();
 
     int start_x = 0;
     int start_y = 0;
     ViewStart( &start_x, &start_y );
-    start_y *= 10;
+    start_y *= PIXELS_PER_UNIT;
 
     int client_h = 0;
     int client_w = 0;
@@ -931,56 +1199,36 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 
     if (item_y < start_y+3)
     {
+        // going down
         int x = 0;
         int y = 0;
-        m_anchor->GetSize( x, y );
-        y += 2*m_lineHeight;
+        m_anchor->GetSize( x, y, this );
+        y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
         int x_pos = GetScrollPos( wxHORIZONTAL );
-        SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 );
+        // Item should appear at top
+        SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, item_y/PIXELS_PER_UNIT );
     }
-    else if (item_y > start_y+client_h-16)
+    else if (item_y+GetLineHeight(gitem) > start_y+client_h)
     {
+       // going up
        int x = 0;
        int y = 0;
-       m_anchor->GetSize( x, y );
-       y += 2*m_lineHeight;
+       m_anchor->GetSize( x, y, this );
+       y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+       item_y += PIXELS_PER_UNIT+2;
        int x_pos = GetScrollPos( wxHORIZONTAL );
-       SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 );
+        // Item should appear at bottom
+       SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, (item_y+GetLineHeight(gitem)-client_h)/PIXELS_PER_UNIT );
     }
 }
 
-void wxTreeCtrl::ScrollTo(const wxTreeItemId& WXUNUSED(item))
-{
-    wxFAIL_MSG("not implemented");
-}
-
-wxTextCtrl *wxTreeCtrl::EditLabel( const wxTreeItemId& WXUNUSED(item),
-                                   wxClassInfo* WXUNUSED(textCtrlClass) )
-{
-    wxFAIL_MSG("not implemented");
-
-    return (wxTextCtrl*)NULL;
-}
-
-wxTextCtrl *wxTreeCtrl::GetEditControl() const
-{
-    wxFAIL_MSG("not implemented");
-
-    return (wxTextCtrl*)NULL;
-}
-
-void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool WXUNUSED(discardChanges))
-{
-    wxFAIL_MSG("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, "bug in wxTreeCtrl::SortChildren()" );
+    wxCHECK_MSG( s_treeBeingSorted, 0, _T("bug in wxTreeCtrl::SortChildren()") );
 
     return s_treeBeingSorted->OnCompareItems(*item1, *item2);
 }
@@ -988,19 +1236,19 @@ static int tree_ctrl_compare_func(wxGenericTreeItem **item1,
 int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
                                const wxTreeItemId& item2)
 {
-    return strcmp(GetItemText(item1), GetItemText(item2));
+    return wxStrcmp(GetItemText(item1), GetItemText(item2));
 }
 
 void wxTreeCtrl::SortChildren(const wxTreeItemId& itemId)
 {
-    wxCHECK_RET( itemId.IsOk(), "invalid tree item" );
+    wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") );
 
     wxGenericTreeItem *item = itemId.m_pItem;
 
     wxCHECK_RET( !s_treeBeingSorted,
-                 "wxTreeCtrl::SortChildren is not reentrant" );
+                 _T("wxTreeCtrl::SortChildren is not reentrant") );
 
-    wxArrayTreeItems& children = item->GetChildren();
+    wxArrayGenericTreeItems& children = item->GetChildren();
     if ( children.Count() > 1 )
     {
         s_treeBeingSorted = this;
@@ -1025,9 +1273,12 @@ wxImageList *wxTreeCtrl::GetStateImageList() const
 void wxTreeCtrl::SetImageList(wxImageList *imageList)
 {
    m_imageListNormal = imageList;
-   // calculate a m_lineHeight value from the image sizes
+
+   // Calculate a m_lineHeight value from the image sizes.
+   // May be toggle off. Then wxTreeCtrl will spread when
+   // necessary (which might look ugly).
+#if 1
    wxPaintDC dc(this);
-   PrepareDC( dc );
    m_lineHeight = (int)(dc.GetCharHeight() + 4);
    int
       width = 0,
@@ -1038,6 +1289,11 @@ void wxTreeCtrl::SetImageList(wxImageList *imageList)
       m_imageListNormal->GetSize(i, width, height);
       if(height > m_lineHeight) m_lineHeight = height;
    }
+
+   if (m_lineHeight<40) m_lineHeight+=4; // at least 4 pixels (odd such that a line can be drawn in between)
+   else m_lineHeight+=m_lineHeight/10;   // otherwise 10% extra spacing
+
+#endif
 }
 
 void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
@@ -1055,11 +1311,12 @@ void wxTreeCtrl::AdjustMyScrollbars()
     {
         int x = 0;
         int y = 0;
-        m_anchor->GetSize( x, y );
-        y += 2*m_lineHeight;
+        m_anchor->GetSize( x, y, this );
+        //y += GetLineHeight(m_anchor);
+        y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
         int x_pos = GetScrollPos( wxHORIZONTAL );
         int y_pos = GetScrollPos( wxVERTICAL );
-        SetScrollbars( 10, 10, x/10, y/10, x_pos, y_pos );
+        SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, y_pos );
     }
     else
     {
@@ -1067,6 +1324,14 @@ void wxTreeCtrl::AdjustMyScrollbars()
     }
 }
 
+int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const
+{
+  if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HEIGHT)
+    return item->GetHeight();
+  else
+    return m_lineHeight;
+}
+
 void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 {
     // render bold items in bold
@@ -1088,7 +1353,7 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
         }
         else
         {
-            wxFAIL_MSG("wxDC::GetFont() failed!");
+            wxFAIL_MSG(_T("wxDC::GetFont() failed!"));
         }
     }
 
@@ -1109,8 +1374,9 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
         image_w += 4;
     }
 
-    int total_h = (image_h > text_h) ? image_h : text_h;
-    dc.DrawRectangle( item->GetX()-2, item->GetY()-2, image_w+text_w+4, total_h+4 );
+    int total_h = GetLineHeight(item);
+
+    dc.DrawRectangle( item->GetX()-2, item->GetY(), item->GetWidth()+2, total_h );
 
     if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
     {
@@ -1142,43 +1408,45 @@ void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
     }
 }
 
+// Now y stands for the top of the item, whereas it used to stand for middle !
 void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
 {
     int horizX = level*m_indent;
 
-    item->SetX( horizX+33 );
-    item->SetY( y-m_lineHeight/3 );
-    item->SetHeight( m_lineHeight );
-
-    item->SetCross( horizX+15, y );
+    item->SetX( horizX+m_indent+m_spacing );
+    item->SetY( y );
 
     int oldY = y;
+    y+=GetLineHeight(item)/2;
+
+    item->SetCross( horizX+m_indent, y );
 
     int exposed_x = dc.LogicalToDeviceX( 0 );
     int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 );
 
-    if (IsExposed( exposed_x, exposed_y, 10000, m_lineHeight+4 ))  // 10000 = very much
+    if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item)+4 ))  // 10000 = very much
     {
         int startX = horizX;
-        int endX = horizX + 10;
+        int endX = horizX + (m_indent-5);
 
+//        if (!item->HasChildren()) endX += (m_indent+5);
         if (!item->HasChildren()) endX += 20;
 
         dc.DrawLine( startX, y, endX, y );
 
         if (item->HasPlus())
         {
-            dc.DrawLine( horizX+20, y, horizX+30, y );
+            dc.DrawLine( horizX+(m_indent+5), y, horizX+(m_indent+15), y );
             dc.SetPen( *wxGREY_PEN );
             dc.SetBrush( *wxWHITE_BRUSH );
-            dc.DrawRectangle( horizX+10, y-4, 11, 9 );
+            dc.DrawRectangle( horizX+(m_indent-5), y-4, 11, 9 );
+            
             dc.SetPen( *wxBLACK_PEN );
-            dc.DrawLine( horizX+13, y, horizX+18, y );
-
+            dc.DrawLine( horizX+(m_indent-2), y, horizX+(m_indent+3), y );
             if (!item->IsExpanded())
-            {
-                dc.DrawLine( horizX+15, y-2, horizX+15, y+3 );
-            }
+                dc.DrawLine( horizX+m_indent, y-2, horizX+m_indent, y+3 );
+                
+            dc.SetPen( m_dottedPen );
         }
 
         if (item->HasHilight())
@@ -1194,7 +1462,7 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
 
             PaintItem(item, dc);
 
-            dc.SetPen( *wxBLACK_PEN );
+            dc.SetPen( m_dottedPen );
             dc.SetTextForeground( *wxBLACK );
             dc.SetBrush( *wxWHITE_BRUSH );
         }
@@ -1205,20 +1473,22 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
 
             PaintItem(item, dc);
 
-            dc.SetPen( *wxBLACK_PEN );
+            dc.SetPen( m_dottedPen );
         }
     }
 
+    y = oldY+GetLineHeight(item);
+
     if (item->IsExpanded())
     {
-        int semiOldY = y;
+        oldY+=GetLineHeight(item)/2;
+        int semiOldY=y; // (=y) for stupid compilator
 
-        wxArrayTreeItems& children = item->GetChildren();
-        size_t count = children.Count();
-        for ( size_t n = 0; n < count; n++ )
+        wxArrayGenericTreeItems& children = item->GetChildren();
+        size_t n, count = children.Count();
+        for ( n = 0; n < count; ++n )
         {
-            y += m_lineHeight;
-            semiOldY = y;
+            semiOldY=y;
             PaintLevel( children[n], dc, level+1, y );
         }
 
@@ -1226,17 +1496,58 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
         // 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 );
+          {
+            semiOldY+=GetLineHeight(children[--n])/2;
+            dc.DrawLine( horizX+m_indent, oldY+5, horizX+m_indent, semiOldY );
+          }
     }
 }
 
+void wxTreeCtrl::DrawBorder(wxTreeItemId &item)
+{
+  if (!item) return;
+
+    wxGenericTreeItem *i=item.m_pItem;
+
+    wxPaintDC dc(this);
+    PrepareDC( dc );
+    dc.SetLogicalFunction(wxINVERT);
+
+    int w,h,x;
+    ViewStart(&x,&h);     // we only need x
+    GetClientSize(&w,&h); // we only need w
+
+    h=GetLineHeight(i)+1;
+    // 2 white column at border
+    dc.DrawRectangle( PIXELS_PER_UNIT*x+2, i->GetY()-1, w-6, h);
+}
+
+void wxTreeCtrl::DrawLine(wxTreeItemId &item, bool below)
+{
+  if (!item) return;
+
+    wxGenericTreeItem *i=item.m_pItem;
+
+    wxPaintDC dc(this);
+    PrepareDC( dc );
+    dc.SetLogicalFunction(wxINVERT);
+
+    int w,h,y;
+    GetSize(&w,&h);
+
+    if (below) y=i->GetY()+GetLineHeight(i)-1;
+    else y=i->GetY();
+
+    dc.DrawLine( 0, y, w, y);
+}
+
 // -----------------------------------------------------------------------------
 // wxWindows callbacks
 // -----------------------------------------------------------------------------
 
 void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
-    if ( !m_anchor )
+    if ( !m_anchor)
         return;
 
     wxPaintDC dc(this);
@@ -1245,10 +1556,10 @@ void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) )
     dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) );
 
     dc.SetPen( m_dottedPen );
-    if(GetImageList() == NULL)
-       m_lineHeight = (int)(dc.GetCharHeight() + 4);
+    //if(GetImageList() == NULL)
+    // m_lineHeight = (int)(dc.GetCharHeight() + 4);
 
-    int y = m_lineHeight / 2 + 2;
+    int y = 2;
     PaintLevel( m_anchor, dc, 0, y );
 }
 
@@ -1273,12 +1584,16 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
     te.SetEventObject( this );
     GetEventHandler()->ProcessEvent( te );
 
-    if (m_current == 0)
+    if ( (m_current == 0) || (m_key_current == 0) )
     {
         event.Skip();
         return;
     }
 
+    bool is_multiple=(GetWindowStyleFlag() & wxTR_MULTIPLE);
+    bool extended_select=(event.ShiftDown() && is_multiple);
+    bool unselect_others=!(extended_select || (event.ControlDown() && is_multiple));
+
     switch (event.KeyCode())
     {
         case '+':
@@ -1317,18 +1632,22 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
             // it's expanded
         case WXK_UP:
             {
-                wxTreeItemId prev = GetPrevSibling( m_current );
+                wxTreeItemId prev = GetPrevSibling( m_key_current );
                 if (!prev)
                 {
-                    prev = GetParent( m_current );
-                    long cockie = 0;
-                    wxTreeItemId current = m_current;
-                    if (current == GetFirstChild( prev, cockie ))
+                    prev = GetParent( m_key_current );
+                    if (prev)
                     {
-                        // otherwise we return to where we came from
-                        SelectItem( prev );
-                        EnsureVisible( prev );
-                        break;
+                        long cockie = 0;
+                        wxTreeItemId current = m_key_current;
+                        if (current == GetFirstChild( prev, cockie ))
+                        {
+                            // otherwise we return to where we came from
+                            SelectItem( prev, unselect_others, extended_select );
+                            m_key_current=prev.m_pItem;
+                            EnsureVisible( prev );
+                            break;
+                        }
                     }
                 }
                 if (prev)
@@ -1342,7 +1661,8 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
                         }
                     }
 
-                    SelectItem( prev );
+                    SelectItem( prev, unselect_others, extended_select );
+                    m_key_current=prev.m_pItem;
                     EnsureVisible( prev );
                 }
             }
@@ -1355,7 +1675,7 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
                 if (prev)
                 {
                     EnsureVisible( prev );
-                    SelectItem( prev );
+                    SelectItem( prev, unselect_others, extended_select );
                 }
             }
             break;
@@ -1368,28 +1688,32 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
 
         case WXK_DOWN:
             {
-                if (IsExpanded(m_current) && HasChildren(m_current))
+                if (IsExpanded(m_key_current) && HasChildren(m_key_current))
                 {
                     long cookie = 0;
-                    wxTreeItemId child = GetFirstChild( m_current, cookie );
-                    SelectItem( child );
+                    wxTreeItemId child = GetFirstChild( m_key_current, cookie );
+                    SelectItem( child, unselect_others, extended_select );
+                    m_key_current=child.m_pItem;
                     EnsureVisible( child );
                 }
                 else
                 {
-                    wxTreeItemId next = GetNextSibling( m_current );
-                    if (next == 0)
+                    wxTreeItemId next = GetNextSibling( m_key_current );
+//                    if (next == 0)
+                    if (!next)
                     {
-                        wxTreeItemId current = m_current;
+                        wxTreeItemId current = m_key_current;
                         while (current && !next)
                         {
                             current = GetParent( current );
                             if (current) next = GetNextSibling( current );
                         }
                     }
-                    if (next != 0)
+//                    if (next != 0)
+                    if (next)
                     {
-                        SelectItem( next );
+                        SelectItem( next, unselect_others, extended_select );
+                        m_key_current=next.m_pItem;
                         EnsureVisible( next );
                     }
                 }
@@ -1417,7 +1741,7 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
                 if ( last.IsOk() )
                 {
                     EnsureVisible( last );
-                    SelectItem( last );
+                    SelectItem( last, unselect_others, extended_select );
                 }
             }
             break;
@@ -1429,7 +1753,7 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
                 if (prev)
                 {
                     EnsureVisible( prev );
-                    SelectItem( prev );
+                    SelectItem( prev, unselect_others, extended_select );
                 }
             }
             break;
@@ -1439,17 +1763,78 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
     }
 }
 
-wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& WXUNUSED(flags))
+wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
+{
+    wxClientDC dc(this);
+    PrepareDC(dc);
+    long x = dc.DeviceToLogicalX( (long)point.x );
+    long y = dc.DeviceToLogicalY( (long)point.y );
+    int w, h;
+    GetSize(&w, &h);
+
+    flags=0;
+    if (point.x<0) flags|=wxTREE_HITTEST_TOLEFT;
+    if (point.x>w) flags|=wxTREE_HITTEST_TORIGHT;
+    if (point.y<0) flags|=wxTREE_HITTEST_ABOVE;
+    if (point.y>h) flags|=wxTREE_HITTEST_BELOW;
+
+    return m_anchor->HitTest( wxPoint(x, y), this, flags);
+}
+
+/* **** */
+
+void wxTreeCtrl::Edit( const wxTreeItemId& item )
+{
+    if (!item.IsOk()) return;
+
+    m_currentEdit = item.m_pItem;
+    
+    wxTreeEvent te( wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT, GetId() );
+    te.m_item = m_currentEdit;
+    te.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( te );
+
+    if (!te.IsAllowed()) return;
+    
+    wxString s = m_currentEdit->GetText();
+    int x = m_currentEdit->GetX();
+    int y = m_currentEdit->GetY();
+    int w = m_currentEdit->GetWidth();
+    int h = m_currentEdit->GetHeight();
+
+    wxClientDC dc(this);
+    PrepareDC( dc );
+    x = dc.LogicalToDeviceX( x );
+    y = dc.LogicalToDeviceY( y );
+
+    wxTreeTextCtrl *text = new wxTreeTextCtrl(
+      this, -1, &m_renameAccept, &m_renameRes, this, s, wxPoint(x-4,y-4), wxSize(w+11,h+8) );
+    text->SetFocus();
+}
+
+void wxTreeCtrl::OnRenameTimer()
 {
-    bool onButton = FALSE;
-    return m_anchor->HitTest( point, onButton );
+    Edit( m_current );
 }
 
+void wxTreeCtrl::OnRenameAccept()
+{
+    wxTreeEvent le( wxEVT_COMMAND_TREE_END_LABEL_EDIT, GetId() );
+    le.m_item = m_currentEdit;
+    le.SetEventObject( this );
+    le.m_label = m_renameRes;
+    GetEventHandler()->ProcessEvent( le );
+    
+    if (!le.IsAllowed()) return;
+    
+    /* DO CHANGE LABEL */
+}
+    
 void wxTreeCtrl::OnMouse( wxMouseEvent &event )
 {
     if (!event.LeftIsDown()) m_dragCount = 0;
 
-    if ( !(event.LeftDown() || event.LeftDClick() || event.Dragging()) ) return;
+    if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return;
 
     if ( !m_anchor ) return;
 
@@ -1458,8 +1843,9 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
     long x = dc.DeviceToLogicalX( (long)event.GetX() );
     long y = dc.DeviceToLogicalY( (long)event.GetY() );
 
-    bool onButton = FALSE;
-    wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), onButton );
+    int flags=0;
+    wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), this, flags);
+    bool onButton = flags & wxTREE_HITTEST_ONITEMBUTTON;
 
     if (item == NULL) return;  /* we hit the blank area */
 
@@ -1481,8 +1867,26 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
         return;
     }
 
-    if (!IsSelected(item))
-        SelectItem(item);  /* we dont support multiple selections, BTW */
+    if (event.LeftUp() && (item == m_current) && 
+        (flags & wxTREE_HITTEST_ONITEMLABEL) && 
+	HasFlag(wxTR_EDIT_LABELS) )
+    {
+        m_renameTimer->Start( 100, TRUE );
+        return;
+    }
+    
+    bool is_multiple=(GetWindowStyleFlag() & wxTR_MULTIPLE);
+    bool extended_select=(event.ShiftDown() && is_multiple);
+    bool unselect_others=!(extended_select || (event.ControlDown() && is_multiple));
+
+    if (onButton)
+    {
+        Toggle( item );
+        if (is_multiple)
+            return;
+    }
+
+    SelectItem(item, unselect_others, extended_select);
 
     if (event.LeftDClick())
     {
@@ -1492,11 +1896,6 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
         event.SetEventObject( this );
         GetEventHandler()->ProcessEvent( event );
     }
-
-    if (onButton)
-    {
-        Toggle( item );
-    }
 }
 
 void wxTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
@@ -1510,19 +1909,57 @@ void wxTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
     m_dirty = FALSE;
 
     CalculatePositions();
-
+    Refresh();
     AdjustMyScrollbars();
 }
 
-// -----------------------------------------------------------------------------
+void wxTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc )
+{
+    long text_w = 0;
+    long text_h = 0;
+    // TODO : check for boldness. Here with suppose that font normal and bold
+    //        have the same height !
+    // TODO : bug here, text_w is sometime not the correct answer !!!
+    dc.GetTextExtent( item->GetText(), &text_w, &text_h );
+    text_h+=4;
 
+    int image_h = 0;
+    int image_w = 0;
+    if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
+    {
+        m_imageListNormal->GetSize( item->GetSelectedImage(), image_w, image_h );
+        image_w += 4;
+    }
+    else if (item->GetImage() != -1)
+    {
+        m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );
+        image_w += 4;
+    }
+
+    int total_h = (image_h > text_h) ? image_h : text_h;
+
+    if (total_h<40) total_h+=4; // at least 4 pixels
+    else total_h+=total_h/10;   // otherwise 10% extra spacing
+
+    item->SetHeight(total_h);
+    if (total_h>m_lineHeight) m_lineHeight=total_h;
+
+    item->SetWidth(image_w+text_w+2);
+}
+
+// -----------------------------------------------------------------------------
+// for developper : y is now the top of the level
+// not the middle of it !
 void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
 {
     int horizX = level*m_indent;
 
-    item->SetX( horizX+33 );
-    item->SetY( y-m_lineHeight/3-2 );
-    item->SetHeight( m_lineHeight );
+    CalculateSize( item, dc );
+
+    // set its position
+    item->SetX( horizX+m_indent+m_spacing );
+    item->SetY( y );
+    y+=GetLineHeight(item);
 
     if ( !item->IsExpanded() )
     {
@@ -1530,13 +1967,10 @@ void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxDC &dc, int level, i
         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
-    }
+    wxArrayGenericTreeItems& children = item->GetChildren();
+    size_t n, count = children.Count();
+    for (n = 0; n < count; ++n )
+      CalculateLevel( children[n], dc, level+1, y );  // recurse
 }
 
 void wxTreeCtrl::CalculatePositions()
@@ -1549,10 +1983,10 @@ void wxTreeCtrl::CalculatePositions()
     dc.SetFont( wxSystemSettings::GetSystemFont( wxSYS_DEFAULT_GUI_FONT ) );
 
     dc.SetPen( m_dottedPen );
-    if(GetImageList() == NULL)
-       m_lineHeight = (int)(dc.GetCharHeight() + 4);
+    //if(GetImageList() == NULL)
+    // m_lineHeight = (int)(dc.GetCharHeight() + 4);
 
-    int y = m_lineHeight / 2 + 2;
+    int y = 2; //GetLineHeight(m_anchor) / 2 + 2;
     CalculateLevel( m_anchor, dc, 0, y ); // start recursion
 }
 
@@ -1583,9 +2017,9 @@ void wxTreeCtrl::RefreshLine( wxGenericTreeItem *item )
 
     wxRect rect;
     rect.x = dc.LogicalToDeviceX( item->GetX() - 2 );
-    rect.y = dc.LogicalToDeviceY( item->GetY() - 2 );
+    rect.y = dc.LogicalToDeviceY( item->GetY());
     rect.width = 1000;
-    rect.height = dc.GetCharHeight() + 6;
+    rect.height = GetLineHeight(item); //dc.GetCharHeight() + 6;
 
     Refresh( TRUE, &rect );
 }