More makefiles, distrib things,

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

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 7231ed7c68acbf6cf6452b9f4b9a2530f31d5b08..edfceee22510faac3b9bebe825105b8b96753d04 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -21,19 +21,37 @@
   #pragma implementation "treectrl.h"
 #endif
 
   #pragma implementation "treectrl.h"
 #endif
 

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

 #include "wx/treectrl.h"
 #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/settings.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/dynarray.h"

+#include "wx/arrimpl.cpp"

 #include "wx/dcclient.h"
 #include "wx/dcclient.h"

-#include "wx/imaglist.h"
+#include "wx/msgdlg.h"

 
 // -----------------------------------------------------------------------------
 // array types
 // -----------------------------------------------------------------------------
 
 
 // -----------------------------------------------------------------------------
 // array types
 // -----------------------------------------------------------------------------
 

-WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayTreeItems);
+class WXDLLEXPORT wxGenericTreeItem;
+
+WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayGenericTreeItems);
+WX_DEFINE_OBJARRAY(wxArrayTreeItemIds);
+
+// ----------------------------------------------------------------------------
+// constants
+// ----------------------------------------------------------------------------
+
+static const int NO_IMAGE = -1;

 
 // -----------------------------------------------------------------------------
 // private classes
 
 // -----------------------------------------------------------------------------
 // private classes


@@ -54,16 +72,19 @@ public:
   ~wxGenericTreeItem();
 
   // trivial accessors
   ~wxGenericTreeItem();
 
   // trivial accessors

-  wxArrayTreeItems& GetChildren() { return m_children; }
+  wxArrayGenericTreeItems& GetChildren() { return m_children; }

 
   const wxString& GetText() const { return m_text; }
 
   const wxString& GetText() const { return m_text; }

-  int GetImage() const { return m_image; }
-  int GetSelectedImage() const { return m_selImage; }
+  int GetImage(wxTreeItemIcon which = wxTreeItemIcon_Normal) const
+    { return m_images[which]; }

   wxTreeItemData *GetData() const { return m_data; }
 
   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; }
+  // returns the current image for the item (depending on its
+  // selected/expanded/whatever state)
+  int GetCurrentImage() const;
+
+  void SetText( const wxString &text );
+  void SetImage(int image, wxTreeItemIcon which) { m_images[which] = image; }

   void SetData(wxTreeItemData *data) { m_data = data; }
 
   void SetHasPlus(bool has = TRUE) { m_hasPlus = has; }
   void SetData(wxTreeItemData *data) { m_data = data; }
 
   void SetHasPlus(bool has = TRUE) { m_hasPlus = has; }


@@ -73,11 +94,16 @@ public:
   int GetX() const { return m_x; }
   int GetY() const { return m_y; }
 
   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; }
 
   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
   wxGenericTreeItem *GetParent() const { return m_parent; }
 
   // operations


@@ -94,12 +120,12 @@ public:
     { m_children.Insert(child, index); }
 
   void SetCross( int x, int y );
     { 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
 
   // 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; }
 
   void Expand() { m_isCollapsed = FALSE; }
   void Collapse() { m_isCollapsed = TRUE; }


@@ -108,7 +134,7 @@ public:
 
   // status inquiries
   bool HasChildren() const { return !m_children.IsEmpty(); }
 
   // status inquiries
   bool HasChildren() const { return !m_children.IsEmpty(); }

-  bool HasHilight()  const { return m_hasHilight; }
+  bool IsSelected()  const { return m_hasHilight; }

   bool IsExpanded()  const { return !m_isCollapsed; }
   bool HasPlus()     const { return m_hasPlus || HasChildren(); }
   bool IsBold()      const { return m_isBold; }
   bool IsExpanded()  const { return !m_isCollapsed; }
   bool HasPlus()     const { return m_hasPlus || HasChildren(); }
   bool IsBold()      const { return m_isBold; }


@@ -116,8 +142,9 @@ public:
 private:
   wxString            m_text;
 
 private:
   wxString            m_text;
 

-  int                 m_image,
-                      m_selImage;
+  // tree ctrl images for the normal, selected, expanded and expanded+selected
+  // states
+  int                 m_images[wxTreeItemIcon_Max];

 
   wxTreeItemData     *m_data;
 
 
   wxTreeItemData     *m_data;
 


@@ -132,7 +159,7 @@ private:
   long                m_height, m_width;
   int                 m_xCross, m_yCross;
   int                 m_level;
   long                m_height, m_width;
   int                 m_xCross, m_yCross;
   int                 m_level;

-  wxArrayTreeItems    m_children;
+  wxArrayGenericTreeItems m_children;

   wxGenericTreeItem  *m_parent;
 };
 
   wxGenericTreeItem  *m_parent;
 };
 


@@ -140,6 +167,76 @@ private:
 // implementation
 // =============================================================================
 
 // 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;
+    (*m_accept) = FALSE;
+    (*m_res) = "";
+    m_startValue = value;
+}
+
+void wxTreeTextCtrl::OnChar( wxKeyEvent &event )
+{
+    if (event.m_keyCode == WXK_RETURN)
+    {
+        (*m_accept) = TRUE;
+        (*m_res) = GetValue();
+        m_owner->SetFocus();
+        return;
+    }
+    if (event.m_keyCode == WXK_ESCAPE)
+    {
+        (*m_accept) = FALSE;
+        (*m_res) = "";
+        m_owner->SetFocus();
+        return;
+    }
+    event.Skip();
+}
+
+void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
+{
+    if (wxPendingDelete.Member(this)) return;
+
+    wxPendingDelete.Append(this);
+
+    if ((*m_accept) && ((*m_res) != m_startValue))
+        m_owner->OnRenameAccept();
+}
+
+#define PIXELS_PER_UNIT 10

 // -----------------------------------------------------------------------------
 // wxTreeEvent
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // wxTreeEvent
 // -----------------------------------------------------------------------------


@@ -164,8 +261,11 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
                                      wxTreeItemData *data)
                  : m_text(text)
 {
                                      wxTreeItemData *data)
                  : m_text(text)
 {

-  m_image = image;
-  m_selImage = selImage;
+  m_images[wxTreeItemIcon_Normal] = image;
+  m_images[wxTreeItemIcon_Selected] = selImage;
+  m_images[wxTreeItemIcon_Expanded] = NO_IMAGE;
+  m_images[wxTreeItemIcon_SelectedExpanded] = NO_IMAGE;
+

   m_data = data;
   m_x = m_y = 0;
   m_xCross = m_yCross = 0;
   m_data = data;
   m_x = m_y = 0;
   m_xCross = m_yCross = 0;


@@ -180,6 +280,10 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
   m_parent = parent;
 
   dc.GetTextExtent( m_text, &m_width, &m_height );
   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()
 }
 
 wxGenericTreeItem::~wxGenericTreeItem()


@@ -187,7 +291,7 @@ wxGenericTreeItem::~wxGenericTreeItem()
   delete m_data;
 
   wxASSERT_MSG( m_children.IsEmpty(),
   delete m_data;
 
   wxASSERT_MSG( m_children.IsEmpty(),

-                "please call DeleteChildren() before deleting the item" );
+                wxT("please call DeleteChildren() before deleting the item") );

 }
 
 void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree)
 }
 
 void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree)


@@ -208,18 +312,19 @@ void wxGenericTreeItem::DeleteChildren(wxTreeCtrl *tree)
   m_children.Empty();
 }
 
   m_children.Empty();
 }
 

-void wxGenericTreeItem::SetText( const wxString &text, wxDC& dc )
+void wxGenericTreeItem::SetText( const wxString &text )

 {
   m_text = text;
 {
   m_text = text;

-
-  dc.GetTextExtent( m_text, &m_width, &m_height );

 }
 
 void wxGenericTreeItem::Reset()
 {
   m_text.Empty();
 }
 
 void wxGenericTreeItem::Reset()
 {
   m_text.Empty();

-  m_image =
-  m_selImage = -1;
+  for ( int i = 0; i < wxTreeItemIcon_Max; i++ )
+  {
+    m_images[i] = NO_IMAGE;
+  }
+

   m_data = NULL;
   m_x = m_y =
   m_height = m_width = 0;
   m_data = NULL;
   m_x = m_y =
   m_height = m_width = 0;


@@ -241,7 +346,7 @@ size_t wxGenericTreeItem::GetChildrenCount(bool recursively) const
     return count;
 
   size_t total = count;
     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();
   }
   {
     total += m_children[n]->GetChildrenCount();
   }


@@ -255,41 +360,66 @@ void wxGenericTreeItem::SetCross( int x, int y )
   m_yCross = y;
 }
 
   m_yCross = y;
 }
 

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

 {
 {

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

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

-  if (width > x) x = width;
+  if ( x < width ) x = width;

 
   if (IsExpanded())
   {
     size_t count = m_children.Count();
 
   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,
     }
   }
 }
 
 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)))

   {
   {

-    // FIXME why +5?
+    if (point.y<m_y+theTree->GetLineHeight(this)/2)
+        flags |= wxTREE_HITTEST_ONITEMUPPERPART;
+    else
+        flags |= wxTREE_HITTEST_ONITEMLOWERPART;
+
+    // 5 is the size of the plus sign

     if ((point.x > m_xCross-5) && (point.x < m_xCross+5) &&
         (point.y > m_yCross-5) && (point.y < m_yCross+5) &&
         (IsExpanded() || HasPlus()))
     {
     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;
     }
 
       return this;
     }
 

-    if ((point.x > m_x) && (point.x < m_x+m_width))
+    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 ( (GetImage() != NO_IMAGE) && theTree->m_imageListNormal )
+          theTree->m_imageListNormal->GetSize(GetImage(), 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;
     }
       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
   {
   }
   else
   {


@@ -298,16 +428,50 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
       size_t count = m_children.Count();
       for ( size_t n = 0; n < count; n++ )
       {
       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;
       }
     }
   }
 
         if ( res != NULL )
           return res;
       }
     }
   }
 

+  flags|=wxTREE_HITTEST_NOWHERE;

   return NULL;
 }
 
   return NULL;
 }
 

+int wxGenericTreeItem::GetCurrentImage() const
+{
+    int image = NO_IMAGE;
+    if ( IsExpanded() )
+    {
+        if ( IsSelected() )
+        {
+            image = GetImage(wxTreeItemIcon_SelectedExpanded);
+        }
+
+        if ( image == NO_IMAGE )
+        {
+            // we usually fall back to the normal item, but try just the
+            // expanded one (and not selected) first in this case
+            image = GetImage(wxTreeItemIcon_Expanded);
+        }
+    }
+    else // not expanded
+    {
+        if ( IsSelected() )
+            image = GetImage(wxTreeItemIcon_Selected);
+    }
+
+    // may be it doesn't have the specific image we want, try the default one
+    // instead
+    if ( image == NO_IMAGE )
+    {
+        image = GetImage();
+    }
+
+    return image;
+}
+

 // -----------------------------------------------------------------------------
 // wxTreeCtrl implementation
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // wxTreeCtrl implementation
 // -----------------------------------------------------------------------------


@@ -326,9 +490,11 @@ END_EVENT_TABLE()
 // -----------------------------------------------------------------------------
 // construction/destruction
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // construction/destruction
 // -----------------------------------------------------------------------------

+

 void wxTreeCtrl::Init()
 {
   m_current =
 void wxTreeCtrl::Init()
 {
   m_current =

+  m_key_current =

   m_anchor = (wxGenericTreeItem *) NULL;
   m_hasFocus = FALSE;
   m_dirty = FALSE;
   m_anchor = (wxGenericTreeItem *) NULL;
   m_hasFocus = FALSE;
   m_dirty = FALSE;


@@ -337,6 +503,7 @@ void wxTreeCtrl::Init()
   m_yScroll = 0;
   m_lineHeight = 10;
   m_indent = 15;
   m_yScroll = 0;
   m_lineHeight = 10;
   m_indent = 15;

+  m_spacing = 18;

 
   m_hilightBrush = new wxBrush
     (
 
   m_hilightBrush = new wxBrush
     (


@@ -346,22 +513,29 @@ void wxTreeCtrl::Init()
 
   m_imageListNormal =
   m_imageListState = (wxImageList *) NULL;
 
   m_imageListNormal =
   m_imageListState = (wxImageList *) NULL;

+
+  m_dragCount = 0;
+
+  m_renameTimer = new wxTreeRenameTimer( this );

 }
 
 bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos, const wxSize& size,
 }
 
 bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
                         const wxPoint& pos, const wxSize& size,

-                        long style, 
-                       const wxValidator &validator,
-                       const wxString& name )
+                        long style,
+            const wxValidator &validator,
+            const wxString& name )

 {
   Init();
 
   wxScrolledWindow::Create( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name );
 {
   Init();
 
   wxScrolledWindow::Create( parent, id, pos, size, style|wxHSCROLL|wxVSCROLL, name );

-  
+
+#if wxUSE_VALIDATORS

   SetValidator( validator );
   SetValidator( validator );

+#endif

 
   SetBackgroundColour( *wxWHITE );
 
   SetBackgroundColour( *wxWHITE );

-  m_dottedPen = wxPen( *wxBLACK, 0, 0 );
+//  m_dottedPen = wxPen( "grey", 0, wxDOT );
+  m_dottedPen = wxPen( "grey", 0, 0 );

 
   return TRUE;
 }
 
   return TRUE;
 }


@@ -371,6 +545,8 @@ wxTreeCtrl::~wxTreeCtrl()
   wxDELETE( m_hilightBrush );
 
   DeleteAllItems();
   wxDELETE( m_hilightBrush );
 
   DeleteAllItems();

+
+  delete m_renameTimer;

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


@@ -385,12 +561,20 @@ size_t wxTreeCtrl::GetCount() const
 void wxTreeCtrl::SetIndent(unsigned int indent)
 {
   m_indent = indent;
 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)
 {
   Refresh();
 }
 
 size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
 {

-  wxCHECK_MSG( item.IsOk(), 0u, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), 0u, wxT("invalid tree item") );

 
   return item.m_pItem->GetChildrenCount(recursively);
 }
 
   return item.m_pItem->GetChildrenCount(recursively);
 }


@@ -401,71 +585,70 @@ size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
 
 wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {
 
 wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {

-  wxCHECK_MSG( item.IsOk(), "", "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxT(""), wxT("invalid tree item") );

 
   return item.m_pItem->GetText();
 }
 
 
   return item.m_pItem->GetText();
 }
 

-int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const
+int wxTreeCtrl::GetItemImage(const wxTreeItemId& item,
+                             wxTreeItemIcon which) const

 {
 {

-  wxCHECK_MSG( item.IsOk(), -1, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), -1, wxT("invalid tree item") );

 
 

-  return item.m_pItem->GetImage();
-}
-
-int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
-{
-  wxCHECK_MSG( item.IsOk(), -1, "invalid tree item" );
-
-  return item.m_pItem->GetSelectedImage();
+  return item.m_pItem->GetImage(which);

 }
 
 wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
 {
 }
 
 wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
 {

-  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), NULL, wxT("invalid tree item") );

 
   return item.m_pItem->GetData();
 }
 
 void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
 {
 
   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(), wxT("invalid tree item") );

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

-  item.m_pItem->SetText(text, dc);
+  wxGenericTreeItem *pItem = item.m_pItem;
+  pItem->SetText(text);
+  CalculateSize(pItem, dc);
+  RefreshLine(pItem);

 }
 
 }
 

-void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
+void wxTreeCtrl::SetItemImage(const wxTreeItemId& item,
+                              int image,
+                              wxTreeItemIcon which)

 {
 {

-  wxCHECK_RET( item.IsOk(), "invalid tree item" );
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );

 
 

-  item.m_pItem->SetImage(image);
-}
-
-void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
-{
-  wxCHECK_RET( item.IsOk(), "invalid tree item" );
+    wxGenericTreeItem *pItem = item.m_pItem;
+    pItem->SetImage(image, which);

 
 

-  item.m_pItem->SetSelectedImage(image);
+    wxClientDC dc(this);
+    CalculateSize(pItem, dc);
+    RefreshLine(pItem);

 }
 
 void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
 {
 }
 
 void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
 {

-  wxCHECK_RET( item.IsOk(), "invalid tree item" );
+  wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );

 
   item.m_pItem->SetData(data);
 }
 
 void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
 {
 
   item.m_pItem->SetData(data);
 }
 
 void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
 {

-  wxCHECK_RET( item.IsOk(), "invalid tree item" );
+  wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );

 
 

-  item.m_pItem->SetHasPlus(has);
+  wxGenericTreeItem *pItem = item.m_pItem;
+  pItem->SetHasPlus(has);
+  RefreshLine(pItem);

 }
 
 void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
 {
 }
 
 void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
 {

-  wxCHECK_RET( item.IsOk(), "invalid tree item" );
+  wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );

 
   // avoid redrawing the tree if no real change
   wxGenericTreeItem *pItem = item.m_pItem;
 
   // avoid redrawing the tree if no real change
   wxGenericTreeItem *pItem = item.m_pItem;


@@ -482,35 +665,35 @@ void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
 
 bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const
 {
 
 bool wxTreeCtrl::IsVisible(const wxTreeItemId& WXUNUSED(item)) const
 {

-  wxFAIL_MSG("not implemented");
+  wxFAIL_MSG(wxT("not implemented"));

 
   return TRUE;
 }
 
 bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 {
 
   return TRUE;
 }
 
 bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 {

-  wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") );

 
   return !item.m_pItem->GetChildren().IsEmpty();
 }
 
 bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
 {
 
   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, wxT("invalid tree item") );

 
   return item.m_pItem->IsExpanded();
 }
 
 bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
 {
 
   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, wxT("invalid tree item") );

 
 

-  return item.m_pItem->HasHilight();
+  return item.m_pItem->IsSelected();

 }
 
 bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
 {
 }
 
 bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
 {

-  wxCHECK_MSG( item.IsOk(), FALSE, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), FALSE, wxT("invalid tree item") );

 
   return item.m_pItem->IsBold();
 }
 
   return item.m_pItem->IsBold();
 }


@@ -521,14 +704,14 @@ bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
 
 wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
 {
 
 wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
 {

-  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );

 
   return item.m_pItem->GetParent();
 }
 
 wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const
 {
 
   return item.m_pItem->GetParent();
 }
 
 wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) const
 {

-  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );

 
   cookie = 0;
   return GetNextChild(item, cookie);
 
   cookie = 0;
   return GetNextChild(item, cookie);


@@ -536,82 +719,91 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item, long& cookie) c
 
 wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const
 {
 
 wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& item, long& cookie) const
 {

-  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );

 
 

-  wxArrayTreeItems& children = item.m_pItem->GetChildren();
+  wxArrayGenericTreeItems& children = item.m_pItem->GetChildren();

   if ( (size_t)cookie < children.Count() )
   {
   if ( (size_t)cookie < children.Count() )
   {

-    return item.m_pItem->GetChildren().Item(cookie++);
+    return children.Item(cookie++);

   }
   else
   {
     // there are no more of them
   }
   else
   {
     // there are no more of them

-    return NULL;
+    return wxTreeItemId();

   }
 }
 
   }
 }
 

+wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
+{
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+
+  wxArrayGenericTreeItems& children = item.m_pItem->GetChildren();
+  return (children.IsEmpty() ? wxTreeItemId() : wxTreeItemId(children.Last()));
+}
+

 wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
 {
 wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
 {

-  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );

 
   wxGenericTreeItem *i = item.m_pItem;
   wxGenericTreeItem *parent = i->GetParent();
   if ( parent == NULL )
   {
     // root item doesn't have any siblings
 
   wxGenericTreeItem *i = item.m_pItem;
   wxGenericTreeItem *parent = i->GetParent();
   if ( parent == NULL )
   {
     // root item doesn't have any siblings

-    return NULL;
+    return wxTreeItemId();

   }
 
   }
 

-  wxArrayTreeItems& siblings = parent->GetChildren();
+  wxArrayGenericTreeItems& siblings = parent->GetChildren();

   int index = siblings.Index(i);
   int index = siblings.Index(i);

-  wxASSERT( index != NOT_FOUND ); // I'm not a child of my parent?
+  wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?

 
   size_t n = (size_t)(index + 1);
 
   size_t n = (size_t)(index + 1);

-  return n == siblings.Count() ? (wxGenericTreeItem*)NULL : siblings[n];
+  return n == siblings.Count() ? wxTreeItemId() : wxTreeItemId(siblings[n]);

 }
 
 wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
 {
 }
 
 wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
 {

-  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );

 
   wxGenericTreeItem *i = item.m_pItem;
   wxGenericTreeItem *parent = i->GetParent();
   if ( parent == NULL )
   {
     // root item doesn't have any siblings
 
   wxGenericTreeItem *i = item.m_pItem;
   wxGenericTreeItem *parent = i->GetParent();
   if ( parent == NULL )
   {
     // root item doesn't have any siblings

-    return NULL;
+    return wxTreeItemId();

   }
 
   }
 

-  wxArrayTreeItems& siblings = parent->GetChildren();
+  wxArrayGenericTreeItems& siblings = parent->GetChildren();

   int index = siblings.Index(i);
   int index = siblings.Index(i);

-  wxASSERT( index != NOT_FOUND ); // I'm not a child of my parent?
+  wxASSERT( index != wxNOT_FOUND ); // I'm not a child of my parent?

 
 

-  return index == 0 ? (wxGenericTreeItem*)NULL : siblings[(size_t)(index - 1)];
+  return index == 0 ? wxTreeItemId()
+                    : wxTreeItemId(siblings[(size_t)(index - 1)]);

 }
 
 wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
 {
 }
 
 wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
 {

-  wxFAIL_MSG("not implemented");
+  wxFAIL_MSG(wxT("not implemented"));

 
 

-  return NULL;
+  return wxTreeItemId();

 }
 
 wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {
 }
 
 wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {

-  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );

 
 

-  wxFAIL_MSG("not implemented");
+  wxFAIL_MSG(wxT("not implemented"));

 
 

-  return NULL;
+  return wxTreeItemId();

 }
 
 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 {
 }
 
 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 {

-  wxCHECK_MSG( item.IsOk(), NULL, "invalid tree item" );
+  wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );

 
 

-  wxFAIL_MSG("not implemented");
+  wxFAIL_MSG(wxT("not implemented"));

 
 

-  return NULL;
+  return wxTreeItemId();

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


@@ -653,7 +845,7 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
                                  int image, int selImage,
                                  wxTreeItemData *data)
 {
                                  int image, int selImage,
                                  wxTreeItemData *data)
 {

-  wxCHECK_MSG( !m_anchor, NULL, "tree can have only one root" );
+  wxCHECK_MSG( !m_anchor, wxTreeItemId(), wxT("tree can have only one root") );

 
   wxClientDC dc(this);
   m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc,
 
   wxClientDC dc(this);
   m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text, dc,


@@ -663,8 +855,8 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
     data->m_pItem = m_anchor;
   }
 
     data->m_pItem = m_anchor;
   }
 

-  AdjustMyScrollbars();

   Refresh();
   Refresh();

+  AdjustMyScrollbars();

 
   return m_anchor;
 }
 
   return m_anchor;
 }


@@ -691,9 +883,9 @@ wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parentId,
   }
 
   int index = parent->GetChildren().Index(idPrevious.m_pItem);
   }
 
   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);
+  wxASSERT_MSG( index != wxNOT_FOUND,
+                wxT("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,
 }
 
 wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parentId,


@@ -762,22 +954,25 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId)
 {
   wxGenericTreeItem *item = itemId.m_pItem;
 
 {
   wxGenericTreeItem *item = itemId.m_pItem;
 

-  if ( !item->HasPlus() ) 
+  if ( !item->HasPlus() )

     return;
     return;

-  
+

   if ( item->IsExpanded() )
     return;
 
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() );
   event.m_item = item;
   event.SetEventObject( this );
   if ( item->IsExpanded() )
     return;
 
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, GetId() );
   event.m_item = item;
   event.SetEventObject( this );

-  if ( ProcessEvent( event ) && event.m_code )
+  
+//  if ( ProcessEvent( event ) && event.m_code )  TODO: Was this a typo ?
+  if ( ProcessEvent( event ) && !event.IsAllowed() )

   {
     // cancelled by program
     return;
   }
 
   item->Expand();
   {
     // cancelled by program
     return;
   }
 
   item->Expand();

+  CalculatePositions();

 
   RefreshSubtree(item);
 
 
   RefreshSubtree(item);
 


@@ -795,7 +990,7 @@ void wxTreeCtrl::Collapse(const wxTreeItemId& itemId)
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() );
   event.m_item = item;
   event.SetEventObject( this );
   wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, GetId() );
   event.m_item = item;
   event.SetEventObject( this );

-  if ( ProcessEvent( event ) && event.m_code )
+  if ( ProcessEvent( event ) && !event.IsAllowed() )

   {
     // cancelled by program
     return;
   {
     // cancelled by program
     return;


@@ -803,7 +998,7 @@ void wxTreeCtrl::Collapse(const wxTreeItemId& itemId)
 
   item->Collapse();
 
 
   item->Collapse();
 

-  wxArrayTreeItems& children = item->GetChildren();
+  wxArrayGenericTreeItems& children = item->GetChildren();

   size_t count = children.Count();
   for ( size_t n = 0; n < count; n++ )
   {
   size_t count = children.Count();
   for ( size_t n = 0; n < count; n++ )
   {


@@ -843,101 +1038,286 @@ 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]);
+    }
+}

 
 

-  if ( m_current != item )
+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->IsSelected();
+
+  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(), wxT("invalid tree item") );
+
+    bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE);
+    wxGenericTreeItem *item = itemId.m_pItem;
+
+    //wxCHECK_RET( ( (!unselect_others) && is_single),
+    //           wxT("this is a single selection tree") );
+
+    // to keep going anyhow !!!
+    if (is_single)
+    {
+        if (item->IsSelected())
+            return; // nothing to do
+        unselect_others = TRUE;
+        extended_select = FALSE;
+    }
+    else if ( unselect_others && item->IsSelected() )
+    {
+        // selection change if there is more than one item currently selected
+        wxArrayTreeItemIds selected_items;
+        if ( GetSelections(selected_items) == 1 )
+            return;
+    }
+

     wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() );
     event.m_item = item;
     event.m_itemOld = m_current;
     event.SetEventObject( this );
     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;
 
       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->IsSelected();
+
+        m_current = m_key_current = item;
+        m_current->SetHilight(select);
+        RefreshLine( m_current );
+    }

 
     event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
     GetEventHandler()->ProcessEvent( event );
 
     event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
     GetEventHandler()->ProcessEvent( event );

-  }

 }
 
 }
 

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

 {
 {

-  wxGenericTreeItem *gitem = item.m_pItem;
-
-  int item_y = gitem->GetY();
-
-  int start_x = 0;
-  int start_y = 0;
-  ViewStart( &start_x, &start_y );
-  start_y *= 10;
+    if ( item->IsSelected() )
+        array.Add(wxTreeItemId(item));

 
 

-  if (item_y < start_y+3)
-  {
-    int x = 0;
-    int y = 0;
-    m_anchor->GetSize( x, y );
-    y += 2*m_lineHeight;
-    int x_pos = GetScrollPos( wxHORIZONTAL );
-    SetScrollbars( 10, 10, x/10, y/10, x_pos, item_y/10 );
-    return;
-  }
+    if ( item->HasChildren() )
+    {
+        wxArrayGenericTreeItems& children = item->GetChildren();
+        size_t count = children.GetCount();
+        for ( size_t n = 0; n < count; ++n )
+            FillArray(children[n],array);
+    }
+}

 
 

-  int w = 0;
-  int h = 0;
-  GetClientSize( &w, &h );
+size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds &array) const
+{
+  array.Empty();
+  FillArray(GetRootItem().m_pItem, array);

 
 

-  if (item_y > start_y+h-26)
-  {
-    int x = 0;
-    int y = 0;
-    m_anchor->GetSize( x, y );
-    y += 2*m_lineHeight;
-    int x_pos = GetScrollPos( wxHORIZONTAL );
-    SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-h+30)/10 );
-     return;
-  }
+  return array.Count();

 }
 
 }
 

-void wxTreeCtrl::ScrollTo(const wxTreeItemId& WXUNUSED(item))
+void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)

 {
 {

-  wxFAIL_MSG("not implemented");
+    if (!item.IsOk()) return;
+
+    wxGenericTreeItem *gitem = item.m_pItem;
+
+    // first expand all parent branches
+    wxGenericTreeItem *parent = gitem->GetParent();
+    while ( parent )
+    {
+        Expand(parent);
+        parent = parent->GetParent();
+    }
+
+    //if (parent) CalculatePositions();
+
+    ScrollTo(item);

 }
 
 }
 

-wxTextCtrl *wxTreeCtrl::EditLabel( const wxTreeItemId& WXUNUSED(item),
-                                   wxClassInfo* WXUNUSED(textCtrlClass) )
+void wxTreeCtrl::ScrollTo(const wxTreeItemId &item)

 {
 {

-  wxFAIL_MSG("not implemented");
+    if (!item.IsOk()) return;

 
 

-  return NULL;
+    // We have to call this here because the label in
+    // question might just have been added and no screen
+    // update taken place.
+    if (m_dirty) wxYield();
+
+    wxGenericTreeItem *gitem = item.m_pItem;
+
+    // now scroll to the item
+    int item_y = gitem->GetY();
+
+    int start_x = 0;
+    int start_y = 0;
+    ViewStart( &start_x, &start_y );
+    start_y *= PIXELS_PER_UNIT;
+
+    int client_h = 0;
+    int client_w = 0;
+    GetClientSize( &client_w, &client_h );
+
+    if (item_y < start_y+3)
+    {
+        // going down
+        int x = 0;
+        int y = 0;
+        m_anchor->GetSize( x, y, this );
+        y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+        int x_pos = GetScrollPos( wxHORIZONTAL );
+        // Item should appear at top
+        SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, item_y/PIXELS_PER_UNIT );
+    }
+    else if (item_y+GetLineHeight(gitem) > start_y+client_h)
+    {
+       // going up
+       int x = 0;
+       int y = 0;
+       m_anchor->GetSize( x, y, this );
+       y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+       item_y += PIXELS_PER_UNIT+2;
+       int x_pos = GetScrollPos( wxHORIZONTAL );
+        // Item should appear at bottom
+       SetScrollbars( PIXELS_PER_UNIT, PIXELS_PER_UNIT, x/PIXELS_PER_UNIT, y/PIXELS_PER_UNIT, x_pos, (item_y+GetLineHeight(gitem)-client_h)/PIXELS_PER_UNIT );
+    }

 }
 
 }
 

-wxTextCtrl *wxTreeCtrl::GetEditControl() const
+// FIXME: tree sorting functions are not reentrant and not MT-safe!
+static wxTreeCtrl *s_treeBeingSorted = NULL;
+
+static int tree_ctrl_compare_func(wxGenericTreeItem **item1,
+                                  wxGenericTreeItem **item2)

 {
 {

-  wxFAIL_MSG("not implemented");
+    wxCHECK_MSG( s_treeBeingSorted, 0, wxT("bug in wxTreeCtrl::SortChildren()") );

 
 

-  return NULL;
+    return s_treeBeingSorted->OnCompareItems(*item1, *item2);

 }
 
 }
 

-void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool WXUNUSED(discardChanges))
+int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
+                               const wxTreeItemId& item2)

 {
 {

-  wxFAIL_MSG("not implemented");
+    return wxStrcmp(GetItemText(item1), GetItemText(item2));

 }
 
 }
 

-void wxTreeCtrl::SortChildren( const wxTreeItemId& WXUNUSED(item),
-                               wxTreeItemCmpFunc *WXUNUSED(cmpFunction))
+void wxTreeCtrl::SortChildren(const wxTreeItemId& itemId)

 {
 {

-  wxFAIL_MSG("not implemented");
+    wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") );
+
+    wxGenericTreeItem *item = itemId.m_pItem;
+
+    wxCHECK_RET( !s_treeBeingSorted,
+                 wxT("wxTreeCtrl::SortChildren is not reentrant") );
+
+    wxArrayGenericTreeItems& children = item->GetChildren();
+    if ( children.Count() > 1 )
+    {
+        s_treeBeingSorted = this;
+        children.Sort(tree_ctrl_compare_func);
+        s_treeBeingSorted = NULL;
+
+        m_dirty = TRUE;
+    }
+    //else: don't make the tree dirty as nothing changed

 }
 
 wxImageList *wxTreeCtrl::GetImageList() const
 }
 
 wxImageList *wxTreeCtrl::GetImageList() const


@@ -952,7 +1332,28 @@ wxImageList *wxTreeCtrl::GetStateImageList() const
 
 void wxTreeCtrl::SetImageList(wxImageList *imageList)
 {
 
 void wxTreeCtrl::SetImageList(wxImageList *imageList)
 {

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

 }
 
 void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
 }
 
 void wxTreeCtrl::SetStateImageList(wxImageList *imageList)


@@ -963,166 +1364,228 @@ void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
 // -----------------------------------------------------------------------------
 // helpers
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 // helpers
 // -----------------------------------------------------------------------------

+

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

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

 }
 
 void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 {
 }
 
 void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 {

-  // render bold items in bold
-  wxFont fontOld;
-  wxFont fontNew;
-  
-  if ( item->IsBold() )
-  {
-      fontOld = dc.GetFont();
-      if (fontOld.Ok())
-      {
-        // @@ is there any better way to make a bold variant of old font?
-        fontNew = wxFont( fontOld.GetPointSize(),
-                          fontOld.GetFamily(),
-                          fontOld.GetStyle(),
-                          wxBOLD,
-                          fontOld.GetUnderlined());
-        dc.SetFont(fontNew);
-      }
-      else
-      {
-        wxFAIL_MSG("wxDC::GetFont() failed!");
-      }
-  }
+    // render bold items in bold
+    wxFont fontOld;
+    wxFont fontNew;

 
 

-  long text_w = 0;
-  long text_h = 0;
-  dc.GetTextExtent( item->GetText(), &text_w, &text_h );
+    if (item->IsBold())
+    {
+        fontOld = dc.GetFont();
+        if (fontOld.Ok())
+        {
+          // VZ: is there any better way to make a bold variant of old font?
+          fontNew = wxFont( fontOld.GetPointSize(),
+                            fontOld.GetFamily(),
+                            fontOld.GetStyle(),
+                            wxBOLD,
+                            fontOld.GetUnderlined());
+          dc.SetFont(fontNew);
+        }
+        else
+        {
+            wxFAIL_MSG(wxT("wxDC::GetFont() failed!"));
+        }
+    }

 
 

-  int image_h = 0;
-  int image_w = 0;
-  if (item->GetImage() != -1)
-  {
-    m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );
-    image_w += 4;
-  }
+    long text_w = 0;
+    long text_h = 0;
+    dc.GetTextExtent( item->GetText(), &text_w, &text_h );

 
 

-  dc.DrawRectangle( item->GetX()-2, item->GetY()-2, image_w+text_w+4, text_h+4 );
+    int image_h = 0;
+    int image_w = 0;
+    int image = item->GetCurrentImage();
+    if ( image != NO_IMAGE )
+    {
+        m_imageListNormal->GetSize( image, image_w, image_h );
+        image_w += 4;
+    }

 
 

-  if (item->GetImage() != -1)
-  {
-    dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, text_h );
-    m_imageListNormal->Draw( item->GetImage(), dc,
-                             item->GetX(), item->GetY()-1,
-                             wxIMAGELIST_DRAW_TRANSPARENT );
-    dc.DestroyClippingRegion();
-  }
+    int total_h = GetLineHeight(item);

 
 

-  dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY() );
+    dc.DrawRectangle( item->GetX()-2, item->GetY(), item->GetWidth()+2, total_h );

 
 

-  // restore normal font for bold items
-  if (fontOld.Ok())
-  {
-      dc.SetFont( fontOld);
-  }
+    if ( image != NO_IMAGE )
+    {
+        dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h );
+        m_imageListNormal->Draw( image, dc,
+                                 item->GetX(),
+                                 item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0),
+                                 wxIMAGELIST_DRAW_TRANSPARENT );
+        dc.DestroyClippingRegion();
+    }
+
+    dc.SetBackgroundMode(wxTRANSPARENT);
+    dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY()
+                 + ((total_h > text_h) ? (total_h - text_h)/2 : 0));
+
+    // restore normal font for bold items
+    if (fontOld.Ok())
+    {
+        dc.SetFont( fontOld);
+    }

 }
 
 }
 

+// Now y stands for the top of the item, whereas it used to stand for middle !

 void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
 {
 void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &y )
 {

-  int horizX = level*m_indent;
+    int horizX = level*m_indent;

 
 

-  item->SetX( horizX+33 );
-  item->SetY( y-m_lineHeight/3 );
-  item->SetHeight( m_lineHeight );
+    item->SetX( horizX+m_indent+m_spacing );
+    item->SetY( y );

 
 

-  item->SetCross( horizX+15, y );
+    int oldY = y;
+    y+=GetLineHeight(item)/2;

 
 

-  int oldY = y;
+    item->SetCross( horizX+m_indent, y );

 
 

-  int exposed_x = dc.LogicalToDeviceX( 0 );
-  int exposed_y = dc.LogicalToDeviceY( item->GetY()-2 );
+    int exposed_x = dc.LogicalToDeviceX( 0 );
+    int exposed_y = dc.LogicalToDeviceY( item->GetY() );

 
 

-  if (IsExposed( exposed_x, exposed_y, 10000, m_lineHeight+4 ))  // 10000 = very much
-  {
-    int startX = horizX;
-    int endX = horizX + 10;
+    if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item) ))  // 10000 = very much
+    {
+        int startX = horizX;
+        int endX = horizX + (m_indent-5);

 
 

-    if (!item->HasChildren()) endX += 20;
+//        if (!item->HasChildren()) endX += (m_indent+5);
+        if (!item->HasChildren()) endX += 20;

 
 

-    dc.DrawLine( startX, y, endX, y );
+        dc.DrawLine( startX, y, endX, y );

 
 

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

 
 

-    if (item->HasHilight())
-    {
-      dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
+            dc.SetPen( *wxBLACK_PEN );
+            dc.DrawLine( horizX+(m_indent-2), y, horizX+(m_indent+3), y );
+            if (!item->IsExpanded())
+                dc.DrawLine( horizX+m_indent, y-2, horizX+m_indent, y+3 );

 
 

-      dc.SetBrush( *m_hilightBrush );
+            dc.SetPen( m_dottedPen );
+        }

 
 

-      if (m_hasFocus)
-        dc.SetPen( *wxBLACK_PEN );
-      else
-        dc.SetPen( *wxTRANSPARENT_PEN );
+        if (item->IsSelected())
+        {
+            dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
+
+            dc.SetBrush( *m_hilightBrush );
+
+            if (m_hasFocus)
+                dc.SetPen( *wxBLACK_PEN );
+            else
+                dc.SetPen( *wxTRANSPARENT_PEN );
+
+            PaintItem(item, dc);
+
+            dc.SetPen( m_dottedPen );
+            dc.SetTextForeground( *wxBLACK );
+            dc.SetBrush( *wxWHITE_BRUSH );
+        }
+        else
+        {
+            dc.SetBrush( *wxWHITE_BRUSH );
+            dc.SetPen( *wxTRANSPARENT_PEN );

 
 

-      PaintItem(item, dc);
+            PaintItem(item, dc);

 
 

-      dc.SetPen( *wxBLACK_PEN );
-      dc.SetTextForeground( *wxBLACK );
-      dc.SetBrush( *wxWHITE_BRUSH );
+            dc.SetPen( m_dottedPen );
+        }

     }
     }

-    else
+
+    y = oldY+GetLineHeight(item);
+
+    if (item->IsExpanded())

     {
     {

-      dc.SetBrush( *wxWHITE_BRUSH );
-      dc.SetPen( *wxTRANSPARENT_PEN );
+        oldY+=GetLineHeight(item)/2;
+        int semiOldY=y; // (=y) for stupid compilator

 
 

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

 
 

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

     }
     }

-  }
+}

 
 

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

 
 

-      wxArrayTreeItems& children = item->GetChildren();
-      size_t count = children.Count();
-      for ( size_t n = 0; n < count; n++ )
-      {
-        y += m_lineHeight;
-        semiOldY = y;
+    wxGenericTreeItem *i=item.m_pItem;

 
 

-        PaintLevel( children[n], dc, level+1, y );
-      }
+    wxClientDC dc(this);
+    PrepareDC( dc );
+    dc.SetLogicalFunction(wxINVERT);

 
 

-      // it may happen that the item is expanded but has no items (when you
-      // delete all its children for example) - don't draw the vertical line
-      // in this case
-      if ( count > 0 )
-          dc.DrawLine( horizX+15, oldY+5, horizX+15, semiOldY );
-  }
+    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;
+
+    wxClientDC 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);

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


@@ -1131,268 +1594,528 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
 
 void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {
 
 void wxTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) )
 {

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

 
 

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

 
 

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

 
 

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

 
 

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

 }
 
 void wxTreeCtrl::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
 }
 
 void wxTreeCtrl::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {

-  m_hasFocus = TRUE;
-  if ( m_current )
-    RefreshLine( m_current );
+    m_hasFocus = TRUE;
+
+    if (m_current) RefreshLine( m_current );

 }
 
 void wxTreeCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {
 }
 
 void wxTreeCtrl::OnKillFocus( wxFocusEvent &WXUNUSED(event) )
 {

-  m_hasFocus = FALSE;
-  if ( m_current )
-    RefreshLine( m_current );
+    m_hasFocus = FALSE;
+
+    if (m_current) RefreshLine( m_current );

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

-  wxTreeEvent te( wxEVT_COMMAND_TREE_KEY_DOWN, GetId() );
-  te.m_code = event.KeyCode();
-  te.SetEventObject( this );
-  GetEventHandler()->ProcessEvent( te );
+    wxTreeEvent te( wxEVT_COMMAND_TREE_KEY_DOWN, GetId() );
+    te.m_code = event.KeyCode();
+    te.SetEventObject( this );
+    GetEventHandler()->ProcessEvent( te );

 
 

-  if (m_current == 0)
-  {
-     event.Skip();
-     return;
-  }
+    if ( (m_current == 0) || (m_key_current == 0) )
+    {
+        event.Skip();
+        return;
+    }

 
 

-  switch (event.KeyCode())
-  {
-    case '+':
-    case WXK_ADD:
-      if (m_current->HasPlus() && !IsExpanded(m_current))
-      {
-        Expand(m_current);
-      }
-      break;
+    bool is_multiple=(GetWindowStyleFlag() & wxTR_MULTIPLE);
+    bool extended_select=(event.ShiftDown() && is_multiple);
+    bool unselect_others=!(extended_select || (event.ControlDown() && is_multiple));

 
 

-    case '-':
-    case WXK_SUBTRACT:
-      if (IsExpanded(m_current))
-      {
-        Collapse(m_current);
-      }
-      break;
+    switch (event.KeyCode())
+    {
+        case '+':
+        case WXK_ADD:
+            if (m_current->HasPlus() && !IsExpanded(m_current))
+            {
+                Expand(m_current);
+            }
+            break;

 
 

-    case '*':
-    case WXK_MULTIPLY:
-      Toggle(m_current);
-      break;
+        case '-':
+        case WXK_SUBTRACT:
+            if (IsExpanded(m_current))
+            {
+                Collapse(m_current);
+            }
+            break;

 
 

-    case ' ':
-    case WXK_RETURN:
-      {
-        wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
-        event.m_item = m_current;
-        event.m_code = 0;
-        event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent( event );
-      }
-      break;
+        case '*':
+        case WXK_MULTIPLY:
+            Toggle(m_current);
+            break;

 
 

-    case WXK_LEFT:
-    case WXK_UP:
-      {
-        wxTreeItemId prev = GetPrevSibling( m_current );
-        if (prev != 0)
-        {
-          SelectItem( prev );
-          EnsureVisible( prev );
-        }
-        else
-        {
-          prev = GetParent( m_current );
-          if (prev)
-          {
-            EnsureVisible( prev );
-            SelectItem( prev );
-          }
-        }
-      }
-      break;
+        case ' ':
+        case WXK_RETURN:
+            {
+                wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
+                event.m_item = m_current;
+                event.m_code = 0;
+                event.SetEventObject( this );
+                GetEventHandler()->ProcessEvent( event );
+            }
+            break;

 
 

-    case WXK_RIGHT:
-      // this works the same as the down arrow except that we also expand the
-      // item if it wasn't expanded yet
-      Expand(m_current);
-      // fall through
+            // up goes to the previous sibling or to the last of its children if
+            // it's expanded
+        case WXK_UP:
+            {
+                wxTreeItemId prev = GetPrevSibling( m_key_current );
+                if (!prev)
+                {
+                    prev = GetParent( m_key_current );
+                    if (prev)
+                    {
+                        long cockie = 0;
+                        wxTreeItemId current = m_key_current;
+                        if (current == GetFirstChild( prev, cockie ))
+                        {
+                            // otherwise we return to where we came from
+                            SelectItem( prev, unselect_others, extended_select );
+                            m_key_current=prev.m_pItem;
+                            EnsureVisible( prev );
+                            break;
+                        }
+                    }
+                }
+                if (prev)
+                {
+                    while ( IsExpanded(prev) && HasChildren(prev) )
+                    {
+                        wxTreeItemId child = GetLastChild(prev);
+                        if ( child )
+                        {
+                            prev = child;
+                        }
+                    }
+
+                    SelectItem( prev, unselect_others, extended_select );
+                    m_key_current=prev.m_pItem;
+                    EnsureVisible( prev );
+                }
+            }
+            break;

 
 

-    case WXK_DOWN:
-      {
-        if (IsExpanded(m_current))
-        {
-          long cookie = 0;
-          wxTreeItemId child = GetFirstChild( m_current, cookie );
-          SelectItem( child );
-          EnsureVisible( child );
-        }
-        else
-        {
-          wxTreeItemId next = GetNextSibling( m_current );
-          if (next == 0)
-          {
-            wxTreeItemId current = m_current;
-            while (current && !next)
+            // left arrow goes to the parent
+        case WXK_LEFT:

             {
             {

-              current = GetParent( current );
-              if (current) next = GetNextSibling( current );
+                wxTreeItemId prev = GetParent( m_current );
+                if (prev)
+                {
+                    EnsureVisible( prev );
+                    SelectItem( prev, unselect_others, extended_select );
+                }

             }
             }

-          }
-          if (next != 0)
-          {
-            SelectItem( next );
-            EnsureVisible( next );
-          }
-        }
-      }
-      break;
+            break;

 
 

-    default:
-      event.Skip();
-  }
+        case WXK_RIGHT:
+            // this works the same as the down arrow except that we also expand the
+            // item if it wasn't expanded yet
+            Expand(m_current);
+            // fall through
+
+        case WXK_DOWN:
+            {
+                if (IsExpanded(m_key_current) && HasChildren(m_key_current))
+                {
+                    long cookie = 0;
+                    wxTreeItemId child = GetFirstChild( m_key_current, cookie );
+                    SelectItem( child, unselect_others, extended_select );
+                    m_key_current=child.m_pItem;
+                    EnsureVisible( child );
+                }
+                else
+                {
+                    wxTreeItemId next = GetNextSibling( m_key_current );
+//                    if (next == 0)
+                    if (!next)
+                    {
+                        wxTreeItemId current = m_key_current;
+                        while (current && !next)
+                        {
+                            current = GetParent( current );
+                            if (current) next = GetNextSibling( current );
+                        }
+                    }
+//                    if (next != 0)
+                    if (next)
+                    {
+                        SelectItem( next, unselect_others, extended_select );
+                        m_key_current=next.m_pItem;
+                        EnsureVisible( next );
+                    }
+                }
+            }
+            break;
+
+            // <End> selects the last visible tree item
+        case WXK_END:
+            {
+                wxTreeItemId last = GetRootItem();
+
+                while ( last.IsOk() && IsExpanded(last) )
+                {
+                    wxTreeItemId lastChild = GetLastChild(last);
+
+                    // it may happen if the item was expanded but then all of
+                    // its children have been deleted - so IsExpanded() returned
+                    // TRUE, but GetLastChild() returned invalid item
+                    if ( !lastChild )
+                        break;
+
+                    last = lastChild;
+                }
+
+                if ( last.IsOk() )
+                {
+                    EnsureVisible( last );
+                    SelectItem( last, unselect_others, extended_select );
+                }
+            }
+            break;
+
+            // <Home> selects the root item
+        case WXK_HOME:
+            {
+                wxTreeItemId prev = GetRootItem();
+                if (prev)
+                {
+                    EnsureVisible( prev );
+                    SelectItem( prev, unselect_others, extended_select );
+                }
+            }
+            break;
+
+        default:
+            event.Skip();
+    }

 }
 
 }
 

-wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& WXUNUSED(flags))
+wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)

 {
 {

-  bool onButton = FALSE;
-  return m_anchor->HitTest( point, onButton );
+    // We have to call this here because the label in
+    // question might just have been added and no screen
+    // update taken place.
+    if (m_dirty) wxYield();
+
+    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;
+
+    // We have to call this here because the label in
+    // question might just have been added and no screen
+    // update taken place.
+    if (m_dirty) wxYield();
+
+    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();
+
+    int image_h = 0;
+    int image_w = 0;
+
+    int image = m_currentEdit->GetCurrentImage();
+    if ( image != NO_IMAGE )
+    {
+        m_imageListNormal->GetSize( image, image_w, image_h );
+        image_w += 4;
+    }
+    x += image_w;
+    w -= image_w + 4; // I don't know why +4 is needed
+
+    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()
+{
+    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;
+
+    SetItemText( m_currentEdit, m_renameRes );

 }
 
 void wxTreeCtrl::OnMouse( wxMouseEvent &event )
 {
 }
 
 void wxTreeCtrl::OnMouse( wxMouseEvent &event )
 {

-  if ( !(event.LeftDown() || event.LeftDClick()) )
-    return;
+    if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return;

 
 

-  if ( !m_anchor )
-    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() );

 
 

-  bool onButton = FALSE;
-  wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), onButton );
-  if ( item == NULL )
-    return;
+    int flags=0;
+    wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), this, flags);
+    bool onButton = flags & wxTREE_HITTEST_ONITEMBUTTON;

 
 

-  if (!IsSelected(item)) SelectItem(item);
+    if (event.Dragging())
+    {
+        if (m_dragCount == 0)
+            m_dragStart = wxPoint(x,y);

 
 

-  if ( event.LeftDClick() )
-  {
-    wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
-    event.m_item = item;
-    event.m_code = 0;
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-  }
+        m_dragCount++;

 
 

-  if ( onButton )
-  {
-    Toggle( item );
-  }
+        if (m_dragCount != 3) return;
+
+        int command = wxEVT_COMMAND_TREE_BEGIN_DRAG;
+        if (event.RightIsDown()) command = wxEVT_COMMAND_TREE_BEGIN_RDRAG;
+
+        wxTreeEvent nevent( command, GetId() );
+        nevent.m_item = m_current;
+        nevent.SetEventObject(this);
+        GetEventHandler()->ProcessEvent(nevent);
+        return;
+    }
+    else
+    {
+        m_dragCount = 0;
+    }
+
+    if (item == NULL) return;  /* we hit the blank area */
+
+    if (event.LeftUp() && (item == m_current) &&
+        (flags & wxTREE_HITTEST_ONITEMLABEL) &&
+        HasFlag(wxTR_EDIT_LABELS) )
+    {
+        m_renameTimer->Start( 100, TRUE );
+        return;
+    }
+
+    bool is_multiple=(GetWindowStyleFlag() & wxTR_MULTIPLE);
+    bool extended_select=(event.ShiftDown() && is_multiple);
+    bool unselect_others=!(extended_select || (event.ControlDown() && is_multiple));
+
+    if (onButton)
+    {
+        Toggle( item );
+        if (is_multiple)
+            return;
+    }
+
+    SelectItem(item, unselect_others, extended_select);
+
+    if (event.LeftDClick())
+    {
+        wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
+        event.m_item = item;
+        event.m_code = 0;
+        event.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event );
+    }

 }
 
 void wxTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
 {
 }
 
 void wxTreeCtrl::OnIdle( wxIdleEvent &WXUNUSED(event) )
 {

-  if (!m_dirty) return;
+    /* after all changes have been done to the tree control,
+     * we actually redraw the tree when everything is over */

 
 

-  m_dirty = FALSE;
+    if (!m_dirty)
+        return;

 
 

-  CalculatePositions();
+    m_dirty = FALSE;

 
 

-  AdjustMyScrollbars();
+    CalculatePositions();
+    Refresh();
+    AdjustMyScrollbars();
+}
+
+void wxTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc )
+{
+    long text_w = 0;
+    long text_h = 0;
+
+    wxFont fontOld;
+    wxFont fontNew;
+    if (item->IsBold())
+    {
+        fontOld = dc.GetFont();
+        if (fontOld.Ok())
+        {
+          // VZ: is there any better way to make a bold variant of old font?
+          fontNew = wxFont( fontOld.GetPointSize(),
+                            fontOld.GetFamily(),
+                            fontOld.GetStyle(),
+                            wxBOLD,
+                            fontOld.GetUnderlined());
+          dc.SetFont(fontNew);
+        }
+        else
+        {
+            wxFAIL_MSG(wxT("wxDC::GetFont() failed!"));
+        }
+    }
+
+    dc.GetTextExtent( item->GetText(), &text_w, &text_h );
+    text_h+=2;
+
+    // restore normal font for bold items
+    if (fontOld.Ok())
+        dc.SetFont( fontOld);
+
+    int image_h = 0;
+    int image_w = 0;
+    int image = item->GetCurrentImage();
+    if ( image != NO_IMAGE )
+    {
+        m_imageListNormal->GetSize( image, 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);

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

-// -----------------------------------------------------------------------------
-void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item,
-                                 wxDC &dc,
-                                 int level,
-                                 int &y )
+// 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;
+    int horizX = level*m_indent;

 
 

-  item->SetX( horizX+33 );
-  item->SetY( y-m_lineHeight/3-2 );
-  item->SetHeight( m_lineHeight );
+    CalculateSize( item, dc );

 
 

-  if ( item->IsExpanded() )
-    return;
+    // set its position
+    item->SetX( horizX+m_indent+m_spacing );
+    item->SetY( y );
+    y+=GetLineHeight(item);

 
 

-  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 );
-  }
+    if ( !item->IsExpanded() )
+    {
+        // we dont need to calculate collapsed branches
+        return;
+    }
+
+    wxArrayGenericTreeItems& children = item->GetChildren();
+    size_t n, count = children.Count();
+    for (n = 0; n < count; ++n )
+      CalculateLevel( children[n], dc, level+1, y );  // recurse

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

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

 
 

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

 
 

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

 
 

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

 
 

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

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

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

 
 

-  int cw = 0;
-  int ch = 0;
-  GetClientSize( &cw, &ch );
+    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;
+    wxRect rect;
+    rect.x = dc.LogicalToDeviceX( 0 );
+    rect.width = cw;
+    rect.y = dc.LogicalToDeviceY( item->GetY() );
+    rect.height = ch;

 
 

-  Refresh( TRUE, &rect );
+    Refresh( TRUE, &rect );

 
 

-  AdjustMyScrollbars();
+    AdjustMyScrollbars();

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

-  wxClientDC dc(this);
-  PrepareDC( dc );
-
-  wxRect rect;
-  rect.x = dc.LogicalToDeviceX( item->GetX() - 2 );
-  rect.y = dc.LogicalToDeviceY( item->GetY() - 2 );
-  rect.width = 1000;
-  rect.height = dc.GetCharHeight() + 6;
-  Refresh( TRUE, &rect );
+    wxClientDC dc(this);
+    PrepareDC( dc );
+
+    int cw = 0;
+    int ch = 0;
+    GetClientSize( &cw, &ch );
+
+    wxRect rect;
+    rect.x = dc.LogicalToDeviceX( 0 );
+    rect.y = dc.LogicalToDeviceY( item->GetY() );
+    rect.width = cw;
+    rect.height = GetLineHeight(item); //dc.GetCharHeight() + 6;
+
+    Refresh( TRUE, &rect );

 }
 
 }