Unicodified wxSplitPath

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

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index fb50c25a1768cfbbaf559dd0a0b6d51994091ff0..c69ea64098cf5f01e8e7f6542e1ed336c39c47f4 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -21,18 +21,28 @@
   #pragma implementation "treectrl.h"
 #endif
 
   #pragma implementation "treectrl.h"
 #endif
 

-#include "wx/treectrl.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+#pragma hdrstop
+#endif
+
+#include "wx/generic/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/dcclient.h"
 #include "wx/settings.h"
 #include "wx/log.h"
 #include "wx/intl.h"
 #include "wx/dynarray.h"
 #include "wx/dcclient.h"

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

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

+class WXDLLEXPORT wxGenericTreeItem;
+

 WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayTreeItems);
 
 // -----------------------------------------------------------------------------
 WX_DEFINE_ARRAY(wxGenericTreeItem *, wxArrayTreeItems);
 
 // -----------------------------------------------------------------------------


@@ -81,7 +91,10 @@ public:
   wxGenericTreeItem *GetParent() const { return m_parent; }
 
   // operations
   wxGenericTreeItem *GetParent() const { return m_parent; }
 
   // operations

-  void DeleteChildren();
+    // deletes all children notifying the treectrl about it if !NULL pointer
+    // given
+  void DeleteChildren(wxTreeCtrl *tree = NULL);
+    // FIXME don't know what is it for

   void Reset();
 
   // get count of all children (and grand children if 'recursively')
   void Reset();
 
   // get count of all children (and grand children if 'recursively')


@@ -183,14 +196,24 @@ wxGenericTreeItem::~wxGenericTreeItem()
 {
   delete m_data;
 
 {
   delete m_data;
 

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

 }
 
 }
 

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

 {
   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++ )

-    delete m_children[n];
+  {
+    wxGenericTreeItem *child = m_children[n];
+    if ( tree )
+    {
+      tree->SendDeleteEvent(child);
+    }
+
+    child->DeleteChildren(tree);
+    delete child;
+  }

 
   m_children.Empty();
 }
 
   m_children.Empty();
 }


@@ -264,6 +287,7 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
   if ((point.y > m_y) && (point.y < m_y + m_height))
   {
     // FIXME why +5?
   if ((point.y > m_y) && (point.y < m_y + m_height))
   {
     // 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()))
     if ((point.x > m_xCross-5) && (point.x < m_xCross+5) &&
         (point.y > m_yCross-5) && (point.y < m_yCross+5) &&
         (IsExpanded() || HasPlus()))


@@ -272,7 +296,12 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
       return this;
     }
 
       return this;
     }
 

-    if ((point.x > m_x) && (point.x < m_x+m_width))
+    /* TODO: we should do a query here like
+         m_imageListNormal->GetSize( item->GetImage(), image_w, image_h );  */
+    int w = m_width;
+    if (m_image != -1) w += 24;
+
+    if ((point.x > m_x) && (point.x < m_x+w))

     {
       onButton = FALSE;
       return this;
     {
       onButton = FALSE;
       return this;


@@ -333,18 +362,20 @@ void wxTreeCtrl::Init()
 
   m_imageListNormal =
   m_imageListState = (wxImageList *) NULL;
 
   m_imageListNormal =
   m_imageListState = (wxImageList *) NULL;

+
+  m_dragCount = 0;

 }
 
 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 );

-  
+

   SetValidator( validator );
 
   SetBackgroundColour( *wxWHITE );
   SetValidator( validator );
 
   SetBackgroundColour( *wxWHITE );


@@ -356,7 +387,8 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
 wxTreeCtrl::~wxTreeCtrl()
 {
   wxDELETE( m_hilightBrush );
 wxTreeCtrl::~wxTreeCtrl()
 {
   wxDELETE( m_hilightBrush );

-  wxDELETE( m_anchor );
+
+  DeleteAllItems();

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


@@ -376,7 +408,7 @@ void wxTreeCtrl::SetIndent(unsigned int indent)
 
 size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
 {
 
 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);
 }
 
   return item.m_pItem->GetChildrenCount(recursively);
 }


@@ -387,71 +419,79 @@ 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(), _T(""), _T("invalid tree item") );

 
   return item.m_pItem->GetText();
 }
 
 int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const
 {
 
   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
 {
 
   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
 {
 
   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)
 {
 
   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);
 
   wxClientDC dc(this);

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

 }
 
 void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
 {
 }
 
 void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
 {

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

 
 

-  item.m_pItem->SetImage(image);
+  wxGenericTreeItem *pItem = item.m_pItem;
+  pItem->SetImage(image);
+  RefreshLine(pItem);

 }
 
 void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
 {
 }
 
 void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
 {

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

 
 

-  item.m_pItem->SetSelectedImage(image);
+  wxGenericTreeItem *pItem = item.m_pItem;
+  pItem->SetSelectedImage(image);
+  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(), _T("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(), _T("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(), _T("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;


@@ -468,35 +508,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(_T("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, _T("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, _T("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, _T("invalid tree item") );

 
   return item.m_pItem->HasHilight();
 }
 
 bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
 {
 
   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();
 }
 
   return item.m_pItem->IsBold();
 }


@@ -507,14 +547,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(), _T("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(), _T("invalid tree item") );

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


@@ -522,82 +562,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(), _T("invalid tree item") );

 
   wxArrayTreeItems& children = item.m_pItem->GetChildren();
   if ( (size_t)cookie < children.Count() )
   {
 
   wxArrayTreeItems& children = item.m_pItem->GetChildren();
   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(), _T("invalid tree item") );
+
+  wxArrayTreeItems& 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(), _T("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();
   int index = siblings.Index(i);
   }
 
   wxArrayTreeItems& siblings = parent->GetChildren();
   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(), _T("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();
   int index = siblings.Index(i);
   }
 
   wxArrayTreeItems& siblings = parent->GetChildren();
   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(_T("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(), _T("invalid tree item") );

 
 

-  wxFAIL_MSG("not implemented");
+  wxFAIL_MSG(_T("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(), _T("invalid tree item") );

 
 

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

 
 

-  return NULL;
+  return wxTreeItemId();

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


@@ -639,7 +688,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(), _T("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,


@@ -677,8 +726,8 @@ 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" );
+  wxASSERT_MSG( index != wxNOT_FOUND,
+                _T("previous item in wxTreeCtrl::InsertItem() is not a sibling") );

   return DoInsertItem(parentId, (size_t)index, text, image, selImage, data);
 }
 
   return DoInsertItem(parentId, (size_t)index, text, image, selImage, data);
 }
 


@@ -698,10 +747,18 @@ wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parentId,
                       image, selImage, data);
 }
 
                       image, selImage, data);
 }
 

+void wxTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)
+{
+  wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, GetId() );
+  event.m_item = item;
+  event.SetEventObject( this );
+  ProcessEvent( event );
+}
+

 void wxTreeCtrl::DeleteChildren(const wxTreeItemId& itemId)
 {
     wxGenericTreeItem *item = itemId.m_pItem;
 void wxTreeCtrl::DeleteChildren(const wxTreeItemId& itemId)
 {
     wxGenericTreeItem *item = itemId.m_pItem;

-    item->DeleteChildren();
+    item->DeleteChildren(this);

 
     m_dirty = TRUE;
 }
 
     m_dirty = TRUE;
 }


@@ -711,17 +768,13 @@ void wxTreeCtrl::Delete(const wxTreeItemId& itemId)
   wxGenericTreeItem *item = itemId.m_pItem;
   wxGenericTreeItem *parent = item->GetParent();
 
   wxGenericTreeItem *item = itemId.m_pItem;
   wxGenericTreeItem *parent = item->GetParent();
 

-  // notify the parent...
-  wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, GetId() );
-  event.m_item = item;
-  event.SetEventObject( this );
-  ProcessEvent( event );
-

   if ( parent )
   {
     parent->GetChildren().Remove(item);
   }
 
   if ( parent )
   {
     parent->GetChildren().Remove(item);
   }
 

+  item->DeleteChildren(this);
+  SendDeleteEvent(item);

   delete item;
 
   m_dirty = TRUE;
   delete item;
 
   m_dirty = TRUE;


@@ -731,7 +784,9 @@ void wxTreeCtrl::DeleteAllItems()
 {
   if ( m_anchor )
   {
 {
   if ( m_anchor )
   {

+    m_anchor->DeleteChildren(this);

     delete m_anchor;
     delete m_anchor;

+

     m_anchor = NULL;
 
     m_dirty = TRUE;
     m_anchor = NULL;
 
     m_dirty = TRUE;


@@ -742,9 +797,9 @@ 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;
 
   if ( item->IsExpanded() )
     return;
 


@@ -758,6 +813,7 @@ void wxTreeCtrl::Expand(const wxTreeItemId& itemId)
   }
 
   item->Expand();
   }
 
   item->Expand();

+  CalculatePositions();

 
   RefreshSubtree(item);
 
 
   RefreshSubtree(item);
 


@@ -853,71 +909,110 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId)
 
 void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 {
 
 void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 {

-  wxGenericTreeItem *gitem = item.m_pItem;
+    wxGenericTreeItem *gitem = item.m_pItem;

 
 

-  int item_y = gitem->GetY();
+    // first expand all parent branches
+    wxGenericTreeItem *parent = gitem->GetParent();
+    while ( parent && !parent->IsExpanded() )
+    {
+        Expand(parent);

 
 

-  int start_x = 0;
-  int start_y = 0;
-  ViewStart( &start_x, &start_y );
-  start_y *= 10;
+        parent = parent->GetParent();
+    }

 
 

-  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;
-  }
+    // now scroll to the item
+    int item_y = gitem->GetY();

 
 

-  int w = 0;
-  int h = 0;
-  GetClientSize( &w, &h );
+    int start_x = 0;
+    int start_y = 0;
+    ViewStart( &start_x, &start_y );
+    start_y *= 10;

 
 

-  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;
-  }
+    int client_h = 0;
+    int client_w = 0;
+    GetClientSize( &client_w, &client_h );
+
+    if (item_y < start_y+3)
+    {
+        int x = 0;
+        int y = 0;
+        m_anchor->GetSize( x, y );
+        y += 2*m_lineHeight;
+        int x_pos = GetScrollPos( wxHORIZONTAL );
+        SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 );
+    }
+    else if (item_y > start_y+client_h-16)
+    {
+       int x = 0;
+       int y = 0;
+       m_anchor->GetSize( x, y );
+       y += 2*m_lineHeight;
+       int x_pos = GetScrollPos( wxHORIZONTAL );
+       SetScrollbars( 10, 10, x/10, y/10, x_pos, (item_y-client_h/2)/10 );
+    }

 }
 
 void wxTreeCtrl::ScrollTo(const wxTreeItemId& WXUNUSED(item))
 {
 }
 
 void wxTreeCtrl::ScrollTo(const wxTreeItemId& WXUNUSED(item))
 {

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

 }
 
 wxTextCtrl *wxTreeCtrl::EditLabel( const wxTreeItemId& WXUNUSED(item),
                                    wxClassInfo* WXUNUSED(textCtrlClass) )
 {
 }
 
 wxTextCtrl *wxTreeCtrl::EditLabel( const wxTreeItemId& WXUNUSED(item),
                                    wxClassInfo* WXUNUSED(textCtrlClass) )
 {

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

 
 

-  return NULL;
+    return (wxTextCtrl*)NULL;

 }
 
 wxTextCtrl *wxTreeCtrl::GetEditControl() const
 {
 }
 
 wxTextCtrl *wxTreeCtrl::GetEditControl() const
 {

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

 
 

-  return NULL;
+    return (wxTextCtrl*)NULL;

 }
 
 void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool WXUNUSED(discardChanges))
 {
 }
 
 void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool WXUNUSED(discardChanges))
 {

-  wxFAIL_MSG("not implemented");
+    wxFAIL_MSG(_T("not implemented"));
+}
+
+// FIXME: tree sorting functions are not reentrant and not MT-safe!
+static wxTreeCtrl *s_treeBeingSorted = NULL;
+
+static int tree_ctrl_compare_func(wxGenericTreeItem **item1,
+                                  wxGenericTreeItem **item2)
+{
+    wxCHECK_MSG( s_treeBeingSorted, 0, _T("bug in wxTreeCtrl::SortChildren()") );
+
+    return s_treeBeingSorted->OnCompareItems(*item1, *item2);
+}
+
+int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
+                               const wxTreeItemId& item2)
+{
+    return wxStrcmp(GetItemText(item1), GetItemText(item2));

 }
 
 }
 

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

 {
 {

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

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


@@ -932,7 +1027,21 @@ 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
+   wxPaintDC dc(this);
+   PrepareDC( dc );
+   m_lineHeight = (int)(dc.GetCharHeight() + 4);
+   int
+      width = 0,
+      height = 0,
+      n = m_imageListNormal->GetImageCount();
+   for(int i = 0; i < n ; i++)
+   {
+      m_imageListNormal->GetSize(i, width, height);
+      height += height/5;  //20% extra spacing
+      if(height > m_lineHeight) m_lineHeight = height;
+   }

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


@@ -943,166 +1052,188 @@ 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 );
+        y += 2*m_lineHeight;
+        int x_pos = GetScrollPos( wxHORIZONTAL );
+        int y_pos = GetScrollPos( wxVERTICAL );
+        SetScrollbars( 10, 10, x/10, y/10, x_pos, y_pos );
+    }
+    else
+    {
+        SetScrollbars( 0, 0, 0, 0 );
+    }

 }
 
 void wxTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 {
 }
 
 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(_T("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;
+    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;
+    }

 
 

-  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 = (image_h > text_h) ? image_h : text_h;
+    if(m_lineHeight > total_h) total_h = m_lineHeight;
+    
+    dc.DrawRectangle( item->GetX()-2, item->GetY(), image_w+text_w+4, total_h );
+
+    if ((item->IsExpanded()) && (item->GetSelectedImage() != -1))
+    {
+        dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h );
+        m_imageListNormal->Draw( item->GetSelectedImage(), dc,
+                                 item->GetX(),
+                                 item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0),
+                                 wxIMAGELIST_DRAW_TRANSPARENT );
+        dc.DestroyClippingRegion();
+    }
+    else if (item->GetImage() != -1)
+    {
+        dc.SetClippingRegion( item->GetX(), item->GetY(), image_w-2, total_h );
+        m_imageListNormal->Draw( item->GetImage(), dc,
+                                 item->GetX(),
+                                 item->GetY() +((total_h > image_h)?((total_h-image_h)/2):0),
+                                 wxIMAGELIST_DRAW_TRANSPARENT );
+        dc.DestroyClippingRegion();
+    }

 
 

-  dc.DrawText( item->GetText(), image_w + item->GetX(), item->GetY() );
+    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);
-  }
+    // restore normal font for bold items
+    if (fontOld.Ok())
+    {
+        dc.SetFont( fontOld);
+    }

 }
 
 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+33 );
+    item->SetY( y-m_lineHeight/2 );
+    item->SetHeight( m_lineHeight );

 
 

-  item->SetCross( horizX+15, y );
+    item->SetCross( horizX+15, y );

 
 

-  int oldY = y;
+    int oldY = 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()-2 );

 
 

-  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, m_lineHeight+4 ))  // 10000 = very much
+    {
+        int startX = horizX;
+        int endX = horizX + 10;

 
 

-    if (!item->HasChildren()) endX += 20;
+        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+20, y, horizX+30, y );
+            dc.SetPen( *wxGREY_PEN );
+            dc.SetBrush( *wxWHITE_BRUSH );
+            dc.DrawRectangle( horizX+10, y-4, 11, 9 );
+            dc.SetPen( *wxBLACK_PEN );
+            dc.DrawLine( horizX+13, y, horizX+18, y );
+
+            if (!item->IsExpanded())
+            {
+                dc.DrawLine( horizX+15, y-2, horizX+15, y+3 );
+            }
+        }

 
 

-    if (item->HasHilight())
-    {
-      dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
+        if (item->HasHilight())
+        {
+            dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );

 
 

-      dc.SetBrush( *m_hilightBrush );
+            dc.SetBrush( *m_hilightBrush );

 
 

-      if (m_hasFocus)
-        dc.SetPen( *wxBLACK_PEN );
-      else
-        dc.SetPen( *wxTRANSPARENT_PEN );
+            if (m_hasFocus)
+                dc.SetPen( *wxBLACK_PEN );
+            else
+                dc.SetPen( *wxTRANSPARENT_PEN );

 
 

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

 
 

-      dc.SetPen( *wxBLACK_PEN );
-      dc.SetTextForeground( *wxBLACK );
-      dc.SetBrush( *wxWHITE_BRUSH );
-    }
-    else
-    {
-      dc.SetBrush( *wxWHITE_BRUSH );
-      dc.SetPen( *wxTRANSPARENT_PEN );
+            dc.SetPen( *wxBLACK_PEN );
+            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.SetPen( *wxBLACK_PEN );
+        }

     }
     }

-  }
-
-  if ( item->IsExpanded() )
-  {
-      int semiOldY = y;

 
 

-      wxArrayTreeItems& children = item->GetChildren();
-      size_t count = children.Count();
-      for ( size_t n = 0; n < count; n++ )
-      {
-        y += m_lineHeight;
-        semiOldY = y;
+    if (item->IsExpanded())
+    {
+        int semiOldY = y;

 
 

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

 
 

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

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


@@ -1111,268 +1242,362 @@ 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 = m_lineHeight / 2 + 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)
+    {
+        event.Skip();
+        return;
+    }

 
 

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

 
 

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

 
 

-    case '*':
-    case WXK_MULTIPLY:
-      Toggle(m_current);
-      break;
+        case '*':
+        case WXK_MULTIPLY:
+            Toggle(m_current);
+            break;

 
 

-    case ' ':
-    case WXK_RETURN:
-      {
-        wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
-        event.m_item = m_current;
-        event.m_code = 0;
-        event.SetEventObject( this );
-        GetEventHandler()->ProcessEvent( event );
-      }
-      break;
+        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_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;
+            // up goes to the previous sibling or to the last of its children if
+            // it's expanded
+        case WXK_UP:
+            {
+                wxTreeItemId prev = GetPrevSibling( m_current );
+                if (!prev)
+                {
+                    prev = GetParent( m_current );
+                    long cockie = 0;
+                    wxTreeItemId current = m_current;
+                    if (current == GetFirstChild( prev, cockie ))
+                    {
+                        // otherwise we return to where we came from
+                        SelectItem( prev );
+                        EnsureVisible( prev );
+                        break;
+                    }
+                }
+                if (prev)
+                {
+                    while ( IsExpanded(prev) && HasChildren(prev) )
+                    {
+                        wxTreeItemId child = GetLastChild(prev);
+                        if ( child )
+                        {
+                            prev = child;
+                        }
+                    }
+
+                    SelectItem( prev );
+                    EnsureVisible( prev );
+                }
+            }
+            break;

 
 

-    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
+            // left arrow goes to the parent
+        case WXK_LEFT:
+            {
+                wxTreeItemId prev = GetParent( m_current );
+                if (prev)
+                {
+                    EnsureVisible( prev );
+                    SelectItem( 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)
+        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:

             {
             {

-              current = GetParent( current );
-              if (current) next = GetNextSibling( current );
+                if (IsExpanded(m_current) && HasChildren(m_current))
+                {
+                    long cookie = 0;
+                    wxTreeItemId child = GetFirstChild( m_current, cookie );
+                    SelectItem( child );
+                    EnsureVisible( child );
+                }
+                else
+                {
+                    wxTreeItemId next = GetNextSibling( m_current );
+                    if (next == 0)
+                    {
+                        wxTreeItemId current = m_current;
+                        while (current && !next)
+                        {
+                            current = GetParent( current );
+                            if (current) next = GetNextSibling( current );
+                        }
+                    }
+                    if (next != 0)
+                    {
+                        SelectItem( next );
+                        EnsureVisible( next );
+                    }
+                }

             }
             }

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

 
 

-    default:
-      event.Skip();
-  }
+            // <End> selects the last visible tree item
+        case WXK_END:
+            {
+                wxTreeItemId last = GetRootItem();
+
+                while ( last.IsOk() && IsExpanded(last) )
+                {
+                    wxTreeItemId lastChild = GetLastChild(last);
+
+                    // it may happen if the item was expanded but then all of
+                    // its children have been deleted - so IsExpanded() returned
+                    // TRUE, but GetLastChild() returned invalid item
+                    if ( !lastChild )
+                        break;
+
+                    last = lastChild;
+                }
+
+                if ( last.IsOk() )
+                {
+                    EnsureVisible( last );
+                    SelectItem( last );
+                }
+            }
+            break;
+
+            // <Home> selects the root item
+        case WXK_HOME:
+            {
+                wxTreeItemId prev = GetRootItem();
+                if (prev)
+                {
+                    EnsureVisible( prev );
+                    SelectItem( prev );
+                }
+            }
+            break;
+
+        default:
+            event.Skip();
+    }

 }
 
 wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& WXUNUSED(flags))
 {
 }
 
 wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& WXUNUSED(flags))
 {

-  bool onButton = FALSE;
-  return m_anchor->HitTest( point, onButton );
+    wxClientDC dc(this);
+    PrepareDC(dc);
+    long x = dc.DeviceToLogicalX( (long)point.x );
+    long y = dc.DeviceToLogicalY( (long)point.y );
+
+    bool onButton = FALSE;
+    return m_anchor->HitTest( wxPoint(x, y), onButton );

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

-  if ( !(event.LeftDown() || event.LeftDClick()) )
-    return;
+    if (!event.LeftIsDown()) m_dragCount = 0;

 
 

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

 
 

-  wxClientDC dc(this);
-  PrepareDC(dc);
-  long x = dc.DeviceToLogicalX( (long)event.GetX() );
-  long y = dc.DeviceToLogicalY( (long)event.GetY() );
+    if ( !m_anchor ) return;

 
 

-  bool onButton = FALSE;
-  wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), onButton );
-  if ( item == NULL )
-    return;
+    wxClientDC dc(this);
+    PrepareDC(dc);
+    long x = dc.DeviceToLogicalX( (long)event.GetX() );
+    long y = dc.DeviceToLogicalY( (long)event.GetY() );

 
 

-  if (!IsSelected(item)) SelectItem(item);
+    bool onButton = FALSE;
+    wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), onButton );

 
 

-  if ( event.LeftDClick() )
-  {
-    wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
-    event.m_item = item;
-    event.m_code = 0;
-    event.SetEventObject( this );
-    GetEventHandler()->ProcessEvent( event );
-  }
+    if (item == NULL) return;  /* we hit the blank area */

 
 

-  if ( onButton )
-  {
-    Toggle( item );
-  }
+    if (event.Dragging())
+    {
+        if (m_dragCount == 2)  /* small drag latency (3?) */
+        {
+            m_dragCount = 0;
+
+            wxTreeEvent nevent(wxEVT_COMMAND_TREE_BEGIN_DRAG, GetId());
+            nevent.m_item = m_current;
+            nevent.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(nevent);
+        }
+        else
+        {
+            m_dragCount++;
+        }
+        return;
+    }
+
+    if (!IsSelected(item))
+        SelectItem(item);  /* we dont support multiple selections, BTW */
+
+    if (event.LeftDClick())
+    {
+        wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
+        event.m_item = item;
+        event.m_code = 0;
+        event.SetEventObject( this );
+        GetEventHandler()->ProcessEvent( event );
+    }
+
+    if (onButton)
+    {
+        Toggle( item );
+    }

 }
 
 void wxTreeCtrl::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();
+
+    AdjustMyScrollbars();

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

-// -----------------------------------------------------------------------------
-void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item,
-                                 wxDC &dc,
-                                 int level,
-                                 int &y )
+
+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 );
+    item->SetX( horizX+33 );
+    item->SetY( y-m_lineHeight/2 );
+    item->SetHeight( m_lineHeight );

 
 

-  if ( item->IsExpanded() )
-    return;
+    if ( !item->IsExpanded() )
+    {
+        // we dont need to calculate collapsed branches
+        return;
+    }

 
 

-  wxArrayTreeItems& children = item->GetChildren();
-  size_t count = children.Count();
-  for ( size_t n = 0; n < count; n++ )
-  {
-    y += m_lineHeight;
-    CalculateLevel( children[n], dc, level+1, y );
-  }
+    wxArrayTreeItems& children = item->GetChildren();
+    size_t count = children.Count();
+    for ( size_t n = 0; n < count; n++ )
+    {
+        y += m_lineHeight;
+        CalculateLevel( children[n], dc, level+1, y );  // recurse
+    }

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

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

 
 

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

 
 

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

 
 

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

 
 

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

 }
 
 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 );
+
+    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 );

 }
 
 }