X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/29d87bba53fc54c4b81c9b8d84c9a99aff5fcc0b..246037e22990a4719c672c2e2a8b62b99cc4d49c:/src/generic/treectrl.cpp

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index 427e182d4d..bd94192309 100644
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -3,7 +3,7 @@
 // Purpose:
 // Author:      Robert Roebling
 // Created:     01/02/97
-// Id:
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -14,6 +14,7 @@
 
 #include "wx/treectrl.h"
 #include "wx/settings.h"
+#include "wx/log.h"
 
 //-----------------------------------------------------------------------------
 // wxTreeItem
@@ -21,7 +22,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject)
 
-wxTreeItem::wxTreeItem(void)
+wxTreeItem::wxTreeItem()
 {
   m_mask = 0;
   m_itemId = 0;
@@ -100,7 +101,7 @@ void wxGenericTreeItem::SetText( const wxString &text, wxDC *dc )
   m_height = lh;
 };
 
-void wxGenericTreeItem::Reset(void)
+void wxGenericTreeItem::Reset()
 {
   m_itemId = -1;
   m_state = 0;
@@ -118,6 +119,7 @@ void wxGenericTreeItem::Reset(void)
   m_yCross = 0;
   m_level = 0;
   m_children.DeleteContents( TRUE );
+  m_isCollapsed = TRUE;
   m_parent = NULL;
 };
 
@@ -137,17 +139,20 @@ void wxGenericTreeItem::GetItem( wxTreeItem &item ) const
     item.m_data = m_data;
 };
 
-bool wxGenericTreeItem::HasChildren(void)
+bool wxGenericTreeItem::HasChildren()
 {
   return m_hasChildren;
 };
 
-bool wxGenericTreeItem::HasPlus(void)
+bool wxGenericTreeItem::HasPlus()
 {
-  return (m_hasChildren && (m_children.Number() == 0));
+  if ( !HasChildren() )
+    return FALSE;
+
+  return !IsExpanded();
 };
 
-int wxGenericTreeItem::NumberOfVisibleDescendents(void)
+int wxGenericTreeItem::NumberOfVisibleDescendents()
 {
   int ret = m_children.Number();
   wxNode *node = m_children.First();
@@ -160,9 +165,9 @@ int wxGenericTreeItem::NumberOfVisibleDescendents(void)
   return ret;
 };
 
-int wxGenericTreeItem::NumberOfVisibleChildren(void)
+int wxGenericTreeItem::NumberOfVisibleChildren()
 {
-  return m_children.Number();
+  return m_isCollapsed ? 0 : m_children.Number();
 };
 
 wxGenericTreeItem *wxGenericTreeItem::FindItem( long itemId ) const
@@ -206,7 +211,7 @@ void wxGenericTreeItem::GetSize( int &x, int &y )
 
 long wxGenericTreeItem::HitTest( const wxPoint& point, int &flags )
 {
-  if (m_parent && ((point.y > m_y) && (point.y < m_y+m_height)))
+  if ((point.y > m_y) && (point.y < m_y+m_height))
   {
     if ((point.x > m_xCross-5) &&
         (point.x < m_xCross+5) &&
@@ -232,13 +237,16 @@ long wxGenericTreeItem::HitTest( const wxPoint& point, int &flags )
   }
   else
   {
-    wxNode *node = m_children.First();
-    while (node)
+    if (!m_isCollapsed)
     {
-      wxGenericTreeItem *child = (wxGenericTreeItem*)node->Data();
-      long res = child->HitTest( point, flags );
-      if (res != -1) return res;
-      node = node->Next();
+      wxNode *node = m_children.First();
+      while (node)
+      {
+        wxGenericTreeItem *child = (wxGenericTreeItem*)node->Data();
+        long res = child->HitTest( point, flags );
+        if (res != -1) return res;
+        node = node->Next();
+      };
     };
   };
   return -1;
@@ -277,8 +285,7 @@ void wxGenericTreeItem::SendSelected( wxWindow *target )
 
 void wxGenericTreeItem::SendDelete( wxWindow *target )
 {
-  wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM,
- target->GetId() );
+  wxTreeEvent event( wxEVT_COMMAND_TREE_DELETE_ITEM, target->GetId() );
   PrepareEvent( event );
   event.SetEventObject( target );
   target->ProcessEvent( event );
@@ -286,10 +293,29 @@ void wxGenericTreeItem::SendDelete( wxWindow *target )
 
 void wxGenericTreeItem::SendExpand( wxWindow *target )
 {
-  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDED,
- target->GetId() );
+  m_isCollapsed = FALSE;
+
+  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_EXPANDING, target->GetId() );
+  event.SetEventObject( target );
+  PrepareEvent( event );
+  target->ProcessEvent( event );
+
+  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_EXPANDED);
   PrepareEvent( event );
+  target->ProcessEvent( event );
+};
+
+void wxGenericTreeItem::SendCollapse( wxWindow *target )
+{
+  m_isCollapsed = TRUE;
+
+  wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_COLLAPSING, target->GetId() );
   event.SetEventObject( target );
+  PrepareEvent( event );
+  target->ProcessEvent( event );
+
+  event.SetEventType(wxEVT_COMMAND_TREE_ITEM_COLLAPSED);
+  PrepareEvent( event );
   target->ProcessEvent( event );
 };
 
@@ -298,7 +324,7 @@ void wxGenericTreeItem::SetHilight( bool set )
   m_hasHilight = set;
 };
 
-bool wxGenericTreeItem::HasHilight(void)
+bool wxGenericTreeItem::HasHilight()
 {
   return m_hasHilight;
 };
@@ -307,8 +333,7 @@ bool wxGenericTreeItem::HasHilight(void)
 // wxTreeCtrl
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl,wxScrolledWindow
-)
+IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl,wxScrolledWindow)
 
 BEGIN_EVENT_TABLE(wxTreeCtrl,wxScrolledWindow)
   EVT_PAINT          (wxTreeCtrl::OnPaint)
@@ -318,7 +343,7 @@ BEGIN_EVENT_TABLE(wxTreeCtrl,wxScrolledWindow)
   EVT_KILL_FOCUS     (wxTreeCtrl::OnKillFocus)
 END_EVENT_TABLE()
 
-wxTreeCtrl::wxTreeCtrl(void)
+wxTreeCtrl::wxTreeCtrl()
 {
   m_current = NULL;
   m_anchor = NULL;
@@ -331,12 +356,13 @@ wxTreeCtrl::wxTreeCtrl(void)
   m_isCreated = FALSE;
   m_dc = NULL;
   m_hilightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
+  m_imageList = NULL;
+  m_smallImageList = NULL;
 };
 
-wxTreeCtrl::wxTreeCtrl(wxWindow *parent, const wxWindowID id,
-            const wxPoint& pos,
- const wxSize& size,
-            const long style, const wxString& name )
+wxTreeCtrl::wxTreeCtrl(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos, const wxSize& size,
+            long style, const wxString& name )
 {
   m_current = NULL;
   m_anchor = NULL;
@@ -349,19 +375,19 @@ wxTreeCtrl::wxTreeCtrl(wxWindow *parent, const wxWindowID id,
   m_isCreated = FALSE;
   m_dc = NULL;
   m_hilightBrush = new wxBrush( wxSystemSettings::GetSystemColour(wxSYS_COLOUR_HIGHLIGHT), wxSOLID );
+  m_imageList = NULL;
+  m_smallImageList = NULL;
   Create( parent, id, pos, size, style, name );
 };
 
-wxTreeCtrl::~wxTreeCtrl(void)
+wxTreeCtrl::~wxTreeCtrl()
 {
   if (m_dc) delete m_dc;
 };
 
-bool wxTreeCtrl::Create(wxWindow *parent, const wxWindowID id,
-            const wxPoint& pos,
- const wxSize& size,
-            const long style
-, const wxString& name )
+bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
+            const wxPoint& pos, const wxSize& size,
+            long style, const wxString& name )
 {
   wxScrolledWindow::Create( parent, id, pos, size, style, name );
   SetBackgroundColour( *wxWHITE );
@@ -369,14 +395,14 @@ bool wxTreeCtrl::Create(wxWindow *parent, const wxWindowID id,
   return TRUE;
 };
 
-int wxTreeCtrl::GetCount(void) const
+int wxTreeCtrl::GetCount() const
 {
   if (!m_anchor) return 0;
   return m_anchor->NumberOfVisibleDescendents();
 };
 
-long wxTreeCtrl::InsertItem( const long parent, const wxString& label, const int image,
-      const int selImage, const long WXUNUSED(insertAfter) )
+long wxTreeCtrl::InsertItem( long parent, const wxString& label, int image,
+      int selImage, long WXUNUSED(insertAfter) )
 {
   wxGenericTreeItem *p = NULL;
   if (parent == 0)
@@ -419,6 +445,8 @@ long wxTreeCtrl::InsertItem( const long parent, const wxString& label, const int
   {
     CalculatePositions();
 
+    if (!p->HasChildren()) p->m_hasChildren = TRUE;
+
     int ch = 0;
     GetClientSize( NULL, &ch );
 
@@ -457,7 +485,7 @@ long wxTreeCtrl::InsertItem( const long parent, const wxString& label, const int
   return m_lastId;
 };
 
-long wxTreeCtrl::InsertItem( const long parent, wxTreeItem &info, const long WXUNUSED(insertAfter) )
+long wxTreeCtrl::InsertItem( long parent, wxTreeItem &info, long WXUNUSED(insertAfter) )
 {
   int oldMask = info.m_mask;
   wxGenericTreeItem *p = NULL;
@@ -498,6 +526,8 @@ long wxTreeCtrl::InsertItem( const long parent, wxTreeItem &info, const long WXU
   {
     CalculatePositions();
 
+    if (!p->HasChildren()) p->m_hasChildren = TRUE;
+
     int ch = 0;
     GetClientSize( NULL, &ch );
 
@@ -537,17 +567,20 @@ long wxTreeCtrl::InsertItem( const long parent, wxTreeItem &info, const long WXU
   return ret;
 };
 
-bool wxTreeCtrl::ExpandItem( const long item, const int action )
+bool wxTreeCtrl::ExpandItem( long item, int action )
 {
   wxGenericTreeItem *i = FindItem( item );
-  if (!i) return FALSE;
+  if (!i)
+    return FALSE;
+
   switch (action)
   {
     case wxTREE_EXPAND_EXPAND:
     {
       i->SendExpand( this );
       break;
-    };
+    }
+
     case wxTREE_EXPAND_COLLAPSE_RESET:
     case wxTREE_EXPAND_COLLAPSE:
     {
@@ -555,42 +588,68 @@ bool wxTreeCtrl::ExpandItem( const long item, const int action )
       while (node)
       {
         wxGenericTreeItem *child = (wxGenericTreeItem*)node->Data();
-        child->SendDelete( this );
-        delete node;
-        node = i->m_children.First();
+        if ( child->IsExpanded() )
+          ExpandItem( child->m_itemId, wxTREE_EXPAND_COLLAPSE );
+        node = node->Next();
       };
 
-      int cw = 0;
-      int ch = 0;
-      GetClientSize( &cw, &ch );
-      wxRect rect;
-      rect.x = 0;
-      rect.width = cw;
-      wxClientDC dc(this);
-      PrepareDC(dc);
-      rect.y = dc.LogicalToDeviceY( i->m_y );
-
-      long doY = 0;
-      dc.GetDeviceOrigin( NULL, &doY );
-      rect.height = ch-rect.y-doY;
-      Refresh( TRUE, &rect );
-
-      AdjustMyScrollbars();
+      CalculatePositions();
+
+      i->SendCollapse( this );
       break;
-    };
+    }
+
     case wxTREE_EXPAND_TOGGLE:
     {
-      if (i->HasPlus())
-        ExpandItem( item, wxTREE_EXPAND_EXPAND );
-      else
+      if ( i->IsExpanded() )
         ExpandItem( item, wxTREE_EXPAND_COLLAPSE );
-      break;
-    };
+      else
+        ExpandItem( item, wxTREE_EXPAND_EXPAND );
+      return TRUE;
+    }
   };
+
+  int cw = 0;
+  int ch = 0;
+  GetClientSize( &cw, &ch );
+  wxRect rect;
+  rect.x = 0;
+  rect.width = cw;
+  wxClientDC dc(this);
+  PrepareDC(dc);
+  rect.y = dc.LogicalToDeviceY( i->m_y );
+
+  long doY = 0;
+  dc.GetDeviceOrigin( NULL, &doY );
+  rect.height = ch-rect.y-doY;
+  Refresh( TRUE, &rect );
+
+  AdjustMyScrollbars();
+
   return TRUE;
 };
 
-bool wxTreeCtrl::DeleteAllItems(void)
+void wxTreeCtrl::DeleteItem( long item )
+{
+  wxGenericTreeItem *pItem = FindItem( item );
+  wxCHECK_RET( pItem != NULL, "wxTreeCtrl::DeleteItem: no such pItem." );
+
+  pItem->m_parent->m_children.DeleteObject(pItem);
+
+  Refresh();
+}
+
+void wxTreeCtrl::DeleteChildren( long item )
+{
+  wxGenericTreeItem *pItem = FindItem( item );
+  wxCHECK_RET( pItem != NULL, "wxTreeCtrl::DeleteChildren: no such pItem." );
+
+  pItem->m_children.Clear();
+
+  Refresh();
+}
+
+bool wxTreeCtrl::DeleteAllItems()
 {
   delete m_anchor;
   m_anchor = NULL;
@@ -606,21 +665,27 @@ bool wxTreeCtrl::GetItem( wxTreeItem &info ) const
   return TRUE;
 };
 
-long wxTreeCtrl::GetItemData( const long item ) const
+long wxTreeCtrl::GetItemData( long item ) const
 {
   wxGenericTreeItem *i = FindItem( item );
   if (!i) return 0;
   return i->m_data;
 };
 
-wxString wxTreeCtrl::GetItemText( const long item ) const
+wxString wxTreeCtrl::GetItemText( long item ) const
 {
   wxGenericTreeItem *i = FindItem( item );
   if (!i) return "";
   return i->m_text;
 };
 
-long wxTreeCtrl::GetParent( const long item ) const
+int wxTreeCtrl::GetItemImage(long item) const
+{
+  wxGenericTreeItem *i = FindItem( item );
+  return i == 0 ? -1 : i->GetImage();
+}
+
+long wxTreeCtrl::GetParent( long item ) const
 {
   wxGenericTreeItem *i = FindItem( item );
   if (!i) return -1;
@@ -629,36 +694,63 @@ long wxTreeCtrl::GetParent( const long item ) const
   return i->m_parent->m_itemId;
 };
 
-long wxTreeCtrl::GetRootItem(void) const
+long wxTreeCtrl::GetRootItem() const
 {
   if (m_anchor) return m_anchor->m_itemId;
   return -1;
 };
 
-long wxTreeCtrl::GetSelection(void) const
+long wxTreeCtrl::GetSelection() const
 {
-  return 0;
+  return m_current ? m_current->GetItemId() : -1;
 };
 
-bool wxTreeCtrl::SelectItem( const long WXUNUSED(item) ) const
+bool wxTreeCtrl::SelectItem(long itemId)
 {
-  return FALSE;
+  wxGenericTreeItem *pItem = FindItem(itemId);
+  if ( !pItem ) {
+    wxLogDebug("Can't select an item %d which doesn't exist.", itemId);
+
+    return FALSE;
+  }
+
+  SelectItem(pItem, FALSE /* no events */);
+
+  return TRUE;
 };
 
-bool wxTreeCtrl::ItemHasChildren( const long item ) const
+void wxTreeCtrl::SelectItem(wxGenericTreeItem *item, bool bDoEvents)
+{
+  if (m_current != item)
+  {
+    if (m_current)
+    {
+      m_current->SetHilight( FALSE );
+      RefreshLine( m_current );
+    };
+    m_current = item;
+    m_current->SetHilight( TRUE );
+    RefreshLine( m_current );
+
+    if ( bDoEvents )
+      m_current->SendSelected( this );
+  }
+}
+
+bool wxTreeCtrl::ItemHasChildren( long item ) const
 {
   wxGenericTreeItem *i = FindItem( item );
   if (!i) return FALSE;
   return i->m_hasChildren;
 };
 
-void wxTreeCtrl::SetIndent( const int indent )
+void wxTreeCtrl::SetIndent( int indent )
 {
   m_indent = indent;
   Refresh();
 };
 
-int wxTreeCtrl::GetIndent(void) const
+int wxTreeCtrl::GetIndent() const
 {
   return m_indent;
 };
@@ -669,10 +761,11 @@ bool wxTreeCtrl::SetItem( wxTreeItem &info )
   if (!i) return FALSE;
   wxClientDC dc(this);
   i->SetItem( info, &dc );
+  Refresh();
   return TRUE;
 };
 
-bool wxTreeCtrl::SetItemData( const long item, const long data )
+bool wxTreeCtrl::SetItemData( long item, long data )
 {
   wxGenericTreeItem *i = FindItem( item );
   if (!i) return FALSE;
@@ -680,7 +773,7 @@ bool wxTreeCtrl::SetItemData( const long item, const long data )
   return TRUE;
 };
 
-bool wxTreeCtrl::SetItemText( const long item, const wxString &text )
+bool wxTreeCtrl::SetItemText( long item, const wxString &text )
 {
   wxGenericTreeItem *i = FindItem( item );
   if (!i) return FALSE;
@@ -689,6 +782,15 @@ bool wxTreeCtrl::SetItemText( const long item, const wxString &text )
   return TRUE;
 };
 
+void wxTreeCtrl::SetItemImage(long item, int image, int imageSel) const
+{
+  wxGenericTreeItem *i = FindItem( item );
+  if ( i != 0 ) {
+    i->SetImage(image);
+    i->SetSelectedImage(imageSel);
+  }
+}
+
 long wxTreeCtrl::HitTest( const wxPoint& point, int &flags )
 {
   flags = 0;
@@ -696,7 +798,27 @@ long wxTreeCtrl::HitTest( const wxPoint& point, int &flags )
   return m_anchor->HitTest( point, flags );
 };
 
-void wxTreeCtrl::AdjustMyScrollbars(void)
+wxImageList *wxTreeCtrl::GetImageList( int which ) const
+{
+  if (which == wxIMAGE_LIST_NORMAL) return m_imageList;
+  return m_smallImageList;
+};
+
+void wxTreeCtrl::SetImageList( wxImageList *imageList, int which )
+{
+  if (which == wxIMAGE_LIST_NORMAL)
+  {
+    if (m_imageList) delete m_imageList;
+    m_imageList = imageList;
+  }
+  else
+  {
+    if (m_smallImageList) delete m_smallImageList;
+    m_smallImageList = imageList;
+  };
+};
+
+void wxTreeCtrl::AdjustMyScrollbars()
 {
   if (m_anchor)
   {
@@ -716,87 +838,87 @@ void wxTreeCtrl::AdjustMyScrollbars(void)
 
 void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
 {
-  int horizX = level*m_indent+10;
-  int oldY = y;
-  wxNode *node = item->m_children.First();
-  while (node)
-  {
-    wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();
-    dc.SetPen( m_dottedPen );
+  int horizX = level*m_indent;
 
-    child->SetCross( horizX+15, y );
+  item->m_x = horizX+33;
+  item->m_y = y-m_lineHeight/3;
+  item->m_height = m_lineHeight;
 
-    if (!node->Next())
-    {
-      if (level != 0) oldY -= (m_lineHeight-5);
-      dc.DrawLine( horizX, oldY, horizX, y );
-    };
+  item->SetCross( horizX+15, y );
 
-    child->m_x = horizX+33;
-    child->m_y = y-m_lineHeight/3;
-    child->m_height = m_lineHeight;
+  int oldY = y;
 
-    if (IsExposed( 0, child->m_y-2, 10000, m_lineHeight+4 ))
-    {
-      int startX = horizX,
-          endX = horizX + 10;
+  if (IsExposed( 0, item->m_y-2, 10000, m_lineHeight+4 ))
+  {
+    int startX = horizX;
+    int endX = horizX + 10;
 
-      if (!(node->Previous()) && (level == 0))
-        startX -= 10;
-      if (!child->HasChildren())
-        endX += 20;
-      dc.DrawLine( startX, y, endX, y );
+    if (!item->HasChildren()) endX += 20;
+    dc.DrawLine( startX, y, endX, y );
 
-      if (child->HasChildren())
+      if (item->HasChildren())
       {
         dc.DrawLine( horizX+20, y, horizX+30, y );
         dc.SetPen( *wxGREY_PEN );
         dc.DrawRectangle( horizX+10, y-4, 11, 9 );
         dc.SetPen( *wxBLACK_PEN );
-        dc.DrawLine( horizX+13, y, horizX+17, y );
-        if (child->HasPlus())
-          dc.DrawLine( horizX+15, y-2, horizX+15, y+2 );
+        dc.DrawLine( horizX+13, y, horizX+18, y );
+        if (item->HasPlus())
+          dc.DrawLine( horizX+15, y-2, horizX+15, y+3 );
       };
 
-      if (child->HasHilight())
+      if (item->HasHilight())
       {
         dc.SetTextForeground( wxSystemSettings::GetSystemColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) );
-#if 0 // VZ: this code leaves horizontal stripes when item is unselected
         dc.SetBrush( *m_hilightBrush );
+        long tw, th;
+        dc.GetTextExtent( item->m_text, &tw, &th );
         if (m_hasFocus)
-          dc.SetPen( wxBLACK_PEN );
+        {
+          dc.SetPen( *wxBLACK_PEN );
+          dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
+        }
         else
-          dc.SetPen( wxTRANSPARENT_PEN );
-        long tw, th;
-        dc.GetTextExtent( child->m_text, &tw, &th );
-        dc.DrawRectangle( child->m_x-2, child->m_y-2, tw+4, th+4 );
-#else
-        int modeOld = dc.GetBackgroundMode();
-        dc.SetTextBackground( *wxBLACK );
-        dc.SetBackgroundMode(wxSOLID);
-#endif // 0
-
-        dc.DrawText( child->m_text, child->m_x, child->m_y );
+        {
+          dc.SetPen( *wxTRANSPARENT_PEN );
+          dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
+        }
+        dc.DrawText( item->m_text, item->m_x, item->m_y );
 
-#if 0 // VZ: same as above
         dc.SetPen( *wxBLACK_PEN );
-#else
-        dc.SetBackgroundMode(modeOld);
-        dc.SetTextBackground( *wxWHITE );
-        dc.SetBrush( *wxWHITE_BRUSH );
-#endif
         dc.SetTextForeground( *wxBLACK );
+        dc.SetBrush( *wxWHITE_BRUSH );
       }
       else
-        dc.DrawText( child->m_text, child->m_x, child->m_y );
-    };
+      {
+        dc.SetPen( *wxTRANSPARENT_PEN );
+        long tw, th;
+        dc.GetTextExtent( item->m_text, &tw, &th );
+        dc.DrawRectangle( item->m_x-2, item->m_y-2, tw+4, th+4 );
+        dc.DrawText( item->m_text, item->m_x, item->m_y );
+        dc.SetPen( *wxBLACK_PEN );
+      };
+  };
+
+  if (item->NumberOfVisibleChildren() == 0) return;
+
+  int semiOldY = y;
+
+  wxNode *node = item->m_children.First();
+  while (node)
+  {
+    wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();
 
     y += m_lineHeight;
-    if (child->NumberOfVisibleChildren() > 0)
-      PaintLevel( child, dc, level+1, y );
+    semiOldY = y;
+
+    PaintLevel( child, dc, level+1, y );
+
     node = node->Next();
   };
-};
+
+  dc.DrawLine( horizX+15, oldY+5, horizX+15, semiOldY );
+}
 
 void wxTreeCtrl::OnPaint( const wxPaintEvent &WXUNUSED(event) )
 {
@@ -854,18 +976,7 @@ void wxTreeCtrl::OnMouse( const wxMouseEvent &event )
   if ((flag != wxTREE_HITTEST_ONITEMBUTTON) &&
       (flag != wxTREE_HITTEST_ONITEMLABEL)) return;
 
-  if (m_current != item)
-  {
-    if (m_current)
-    {
-      m_current->SetHilight( FALSE );
-      RefreshLine( m_current );
-    };
-    m_current = item;
-    m_current->SetHilight( TRUE );
-    RefreshLine( m_current );
-    m_current->SendSelected( this );
-  };
+  SelectItem(item);
 
   if (event.LeftDClick())
     m_current->SendKeyDown( this );
@@ -879,34 +990,27 @@ void wxTreeCtrl::OnMouse( const wxMouseEvent &event )
 
 void wxTreeCtrl::CalculateLevel( wxGenericTreeItem *item, wxPaintDC &dc, int level, int &y )
 {
-  int horizX = level*m_indent+10;
+  int horizX = level*m_indent;
+
+  item->m_x = horizX+33;
+  item->m_y = y-m_lineHeight/3-2;
+  item->m_height = m_lineHeight;
+
+  if (item->NumberOfVisibleChildren() == 0) return;
+
   wxNode *node = item->m_children.First();
   while (node)
   {
     wxGenericTreeItem *child = (wxGenericTreeItem *)node->Data();
-    dc.SetPen( m_dottedPen );
-
-    int startX = horizX,
-        endX = horizX + 10;
-
-    if (!node->Previous() && (level == 0))
-      startX -= 10;
-    if (!child->HasChildren())
-      endX += 20;
-
-    child->m_x = horizX+33;
-    child->m_y = y-m_lineHeight/3-2;
-    child->m_height = m_lineHeight;
 
     y += m_lineHeight;
-    if (child->NumberOfVisibleChildren() > 0)
-      CalculateLevel( child, dc, level+1, y );
+    CalculateLevel( child, dc, level+1, y );
 
     node = node->Next();
   };
 };
 
-void wxTreeCtrl::CalculatePositions(void)
+void wxTreeCtrl::CalculatePositions()
 {
   if (!m_anchor)
     return;