More stubs

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

diff --git a/src/generic/treectrl.cpp b/src/generic/treectrl.cpp
index d8ee1f164169ed4c4d44a962347f06f6958aa879..21f04410553a5c68acb4e52316fc2326a81a079d 100644 (file)
--- a/src/generic/treectrl.cpp
+++ b/src/generic/treectrl.cpp
@@ -28,7 +28,7 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

-#include "wx/generic/treectrl.h"
+#include "wx/treectrl.h"

 #include "wx/generic/imaglist.h"
 #include "wx/settings.h"
 #include "wx/log.h"
 #include "wx/generic/imaglist.h"
 #include "wx/settings.h"
 #include "wx/log.h"


@@ -157,6 +157,75 @@ 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
 #define PIXELS_PER_UNIT 10
 // -----------------------------------------------------------------------------
 // wxTreeEvent


@@ -293,8 +362,8 @@ void wxGenericTreeItem::GetSize( int &x, int &y, const wxTreeCtrl *theTree )
 }
 
 wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
 }
 
 wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,

-                                              const wxTreeCtrl *theTree,
-                                              int &flags)
+                                               const wxTreeCtrl *theTree,
+                                               int &flags)

 {
   if ((point.y > m_y) && (point.y < m_y + theTree->GetLineHeight(this)))
   {
 {
   if ((point.y > m_y) && (point.y < m_y + theTree->GetLineHeight(this)))
   {


@@ -317,12 +386,13 @@ wxGenericTreeItem *wxGenericTreeItem::HitTest( const wxPoint& point,
       int image_h;
 
       // assuming every image (normal and selected ) has the same size !
       int image_h;
 
       // assuming every image (normal and selected ) has the same size !

-      if (theTree->m_imageListNormal)
+      if ((m_image!=-1) && theTree->m_imageListNormal)

           theTree->m_imageListNormal->GetSize(m_image, image_w, image_h);
           theTree->m_imageListNormal->GetSize(m_image, image_w, image_h);

+

       if ((image_w != -1) && (point.x <= m_x + image_w + 1))
       if ((image_w != -1) && (point.x <= m_x + image_w + 1))

-       flags|=wxTREE_HITTEST_ONITEMICON;
+        flags|=wxTREE_HITTEST_ONITEMICON;

       else
       else

-       flags|=wxTREE_HITTEST_ONITEMLABEL;
+        flags|=wxTREE_HITTEST_ONITEMLABEL;

 
       return this;
     }
 
       return this;
     }


@@ -393,6 +463,8 @@ void wxTreeCtrl::Init()
   m_imageListState = (wxImageList *) NULL;
 
   m_dragCount = 0;
   m_imageListState = (wxImageList *) NULL;
 
   m_dragCount = 0;

+
+  m_renameTimer = new wxTreeRenameTimer( this );

 }
 
 bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
 }
 
 bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,


@@ -410,7 +482,8 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
 #endif
 
   SetBackgroundColour( *wxWHITE );
 #endif
 
   SetBackgroundColour( *wxWHITE );

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

 
   return TRUE;
 }
 
   return TRUE;
 }


@@ -420,6 +493,8 @@ wxTreeCtrl::~wxTreeCtrl()
   wxDELETE( m_hilightBrush );
 
   DeleteAllItems();
   wxDELETE( m_hilightBrush );
 
   DeleteAllItems();

+
+  delete m_renameTimer;

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


@@ -875,7 +950,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;


@@ -933,7 +1008,7 @@ void wxTreeCtrl::UnselectAllChildren(wxGenericTreeItem *item)
       wxArrayGenericTreeItems& children = item->GetChildren();
       size_t count = children.Count();
       for ( size_t n = 0; n < count; ++n )
       wxArrayGenericTreeItems& children = item->GetChildren();
       size_t count = children.Count();
       for ( size_t n = 0; n < count; ++n )

-       UnselectAllChildren(children[n]);
+        UnselectAllChildren(children[n]);

     }
 }
 
     }
 }
 


@@ -978,7 +1053,7 @@ bool wxTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxGenericT
       wxArrayGenericTreeItems& children = crt_item->GetChildren();
       size_t count = children.Count();
       for ( size_t n = 0; n < count; ++n )
       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;
+        if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE;

     }
 
   return FALSE;
     }
 
   return FALSE;


@@ -1009,24 +1084,31 @@ void wxTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *it
 }
 
 void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
 }
 
 void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,

-                           bool unselect_others,
-                           bool extended_select)
+                            bool unselect_others,
+                            bool extended_select)

 {
     wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") );
 
     bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE);
 {
     wxCHECK_RET( itemId.IsOk(), _T("invalid tree item") );
 
     bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE);

+    wxGenericTreeItem *item = itemId.m_pItem;

 
     //wxCHECK_RET( ( (!unselect_others) && is_single),
     //           _T("this is a single selection tree") );
 
     // to keep going anyhow !!!
     if (is_single)
 
     //wxCHECK_RET( ( (!unselect_others) && is_single),
     //           _T("this is a single selection tree") );
 
     // to keep going anyhow !!!
     if (is_single)

-    {
+      { 
+        if (item->HasHilight()) return; // nothing to do

         unselect_others=TRUE;
         extended_select=FALSE;
         unselect_others=TRUE;
         extended_select=FALSE;

-    }
-
-    wxGenericTreeItem *item = itemId.m_pItem;
+      }
+    else // check if selection will really change
+      if (unselect_others && item->HasHilight())
+      {
+       // 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;
 
     wxTreeEvent event( wxEVT_COMMAND_TREE_SEL_CHANGING, GetId() );
     event.m_item = item;


@@ -1034,14 +1116,14 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
     event.SetEventObject( this );
     // TODO : Here we don't send any selection mode yet !
 
     event.SetEventObject( this );
     // TODO : Here we don't send any selection mode yet !
 

-    if ( GetEventHandler()->ProcessEvent( event ) && event.WasVetoed() )
+    if ( GetEventHandler()->ProcessEvent( event ) && !event.IsAllowed() )

       return;
 
     // ctrl press
     if (unselect_others)
     {
         if (is_single) Unselect(); // to speed up thing
       return;
 
     // ctrl press
     if (unselect_others)
     {
         if (is_single) Unselect(); // to speed up thing

-       else UnselectAll();
+        else UnselectAll();

     }
 
     // shift press
     }
 
     // shift press


@@ -1055,29 +1137,31 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& itemId,
     {
         bool select=TRUE; // the default
 
     {
         bool select=TRUE; // the default
 

-       // Check if we need to toggle hilight (ctrl mode)
-       if (!unselect_others)
-         select=!item->HasHilight();
+        // Check if we need to toggle hilight (ctrl mode)
+        if (!unselect_others)
+          select=!item->HasHilight();

 
         m_current = m_key_current = item;
 
         m_current = m_key_current = item;

-       m_current->SetHilight(select);
-       RefreshLine( m_current );
+        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::FillArray(wxGenericTreeItem *item, wxArrayTreeItemIds &array) const
+void wxTreeCtrl::FillArray(wxGenericTreeItem *item,
+                           wxArrayTreeItemIds &array) const

 {
 {

-  if (item->HasHilight()) array.Add(wxTreeItemId(item));
+    if ( item->HasHilight() )
+        array.Add(wxTreeItemId(item));

 
 

-  if (item->HasChildren())
+    if ( item->HasChildren() )

     {
     {

-      wxArrayGenericTreeItems& children = item->GetChildren();
-      size_t count = children.Count();
-      for ( size_t n = 0; n < count; ++n )
-       FillArray(children[n],array);
+        wxArrayGenericTreeItems& children = item->GetChildren();
+        size_t count = children.GetCount();
+        for ( size_t n = 0; n < count; ++n )
+            FillArray(children[n],array);

     }
 }
 
     }
 }
 


@@ -1097,14 +1181,13 @@ void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 
     // first expand all parent branches
     wxGenericTreeItem *parent = gitem->GetParent();
 
     // first expand all parent branches
     wxGenericTreeItem *parent = gitem->GetParent();

-    while ( parent && !parent->IsExpanded() )
+    while ( parent )

     {
     {

-        Expand(parent);
-
+       Expand(parent);

         parent = parent->GetParent();
     }
 
         parent = parent->GetParent();
     }
 

-    if (parent) CalculatePositions();
+    //if (parent) CalculatePositions();

 
     ScrollTo(item);
 }
 
     ScrollTo(item);
 }


@@ -1113,11 +1196,16 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item)
 {
     if (!item.IsOk()) return;
 
 {
     if (!item.IsOk()) 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();
+

     wxGenericTreeItem *gitem = item.m_pItem;
 
     // now scroll to the item
     int item_y = gitem->GetY();
     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 );
     int start_x = 0;
     int start_y = 0;
     ViewStart( &start_x, &start_y );


@@ -1135,7 +1223,7 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item)
         m_anchor->GetSize( x, y, this );
         y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
         int x_pos = GetScrollPos( wxHORIZONTAL );
         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
+        // 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)
         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)


@@ -1147,31 +1235,11 @@ void wxTreeCtrl::ScrollTo(const wxTreeItemId &item)
        y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
        item_y += PIXELS_PER_UNIT+2;
        int x_pos = GetScrollPos( wxHORIZONTAL );
        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
+        // 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 );
     }
 }
 
        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::EditLabel( const wxTreeItemId& WXUNUSED(item),
-                                   wxClassInfo* WXUNUSED(textCtrlClass) )
-{
-    wxFAIL_MSG(_T("not implemented"));
-
-    return (wxTextCtrl*)NULL;
-}
-
-wxTextCtrl *wxTreeCtrl::GetEditControl() const
-{
-    wxFAIL_MSG(_T("not implemented"));
-
-    return (wxTextCtrl*)NULL;
-}
-
-void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool WXUNUSED(discardChanges))
-{
-    wxFAIL_MSG(_T("not implemented"));
-}
-

 // FIXME: tree sorting functions are not reentrant and not MT-safe!
 static wxTreeCtrl *s_treeBeingSorted = NULL;
 
 // FIXME: tree sorting functions are not reentrant and not MT-safe!
 static wxTreeCtrl *s_treeBeingSorted = NULL;
 


@@ -1228,7 +1296,7 @@ void wxTreeCtrl::SetImageList(wxImageList *imageList)
    // May be toggle off. Then wxTreeCtrl will spread when
    // necessary (which might look ugly).
 #if 1
    // May be toggle off. Then wxTreeCtrl will spread when
    // necessary (which might look ugly).
 #if 1

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

    m_lineHeight = (int)(dc.GetCharHeight() + 4);
    int
       width = 0,
    m_lineHeight = (int)(dc.GetCharHeight() + 4);
    int
       width = 0,


@@ -1263,7 +1331,7 @@ void wxTreeCtrl::AdjustMyScrollbars()
         int y = 0;
         m_anchor->GetSize( x, y, this );
         //y += GetLineHeight(m_anchor);
         int y = 0;
         m_anchor->GetSize( x, y, this );
         //y += GetLineHeight(m_anchor);

-       y += PIXELS_PER_UNIT+2; // one more scrollbar unit + 2 pixels
+        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 );
         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 );


@@ -1276,10 +1344,10 @@ void wxTreeCtrl::AdjustMyScrollbars()
 
 int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const
 {
 
 int wxTreeCtrl::GetLineHeight(wxGenericTreeItem *item) const
 {

-  if (GetWindowStyleFlag() & wxTR_HAS_VARIABLE_ROW_HIGHT)
-    return item->GetHeight();
-  else
-    return m_lineHeight;
+    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)


@@ -1372,9 +1440,9 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
     item->SetCross( horizX+m_indent, y );
 
     int exposed_x = dc.LogicalToDeviceX( 0 );
     item->SetCross( horizX+m_indent, y );
 
     int exposed_x = dc.LogicalToDeviceX( 0 );

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

 
 

-    if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item)+4 ))  // 10000 = very much
+    if (IsExposed( exposed_x, exposed_y, 10000, GetLineHeight(item) ))  // 10000 = very much

     {
         int startX = horizX;
         int endX = horizX + (m_indent-5);
     {
         int startX = horizX;
         int endX = horizX + (m_indent-5);


@@ -1390,12 +1458,12 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
             dc.SetPen( *wxGREY_PEN );
             dc.SetBrush( *wxWHITE_BRUSH );
             dc.DrawRectangle( horizX+(m_indent-5), y-4, 11, 9 );
             dc.SetPen( *wxGREY_PEN );
             dc.SetBrush( *wxWHITE_BRUSH );
             dc.DrawRectangle( horizX+(m_indent-5), y-4, 11, 9 );

-           
+

             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.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.SetPen( m_dottedPen );
         }
 
             dc.SetPen( m_dottedPen );
         }
 


@@ -1437,19 +1505,19 @@ void wxTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level, int &
         wxArrayGenericTreeItems& children = item->GetChildren();
         size_t n, count = children.Count();
         for ( n = 0; n < count; ++n )
         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 );
-       }
+        {
+            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)
 
         // 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;
+          {
+            semiOldY+=GetLineHeight(children[--n])/2;

             dc.DrawLine( horizX+m_indent, oldY+5, horizX+m_indent, semiOldY );
             dc.DrawLine( horizX+m_indent, oldY+5, horizX+m_indent, semiOldY );

-         }
+          }

     }
 }
 
     }
 }
 


@@ -1459,7 +1527,7 @@ void wxTreeCtrl::DrawBorder(wxTreeItemId &item)
 
     wxGenericTreeItem *i=item.m_pItem;
 
 
     wxGenericTreeItem *i=item.m_pItem;
 

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

     PrepareDC( dc );
     dc.SetLogicalFunction(wxINVERT);
 
     PrepareDC( dc );
     dc.SetLogicalFunction(wxINVERT);
 


@@ -1478,7 +1546,7 @@ void wxTreeCtrl::DrawLine(wxTreeItemId &item, bool below)
 
     wxGenericTreeItem *i=item.m_pItem;
 
 
     wxGenericTreeItem *i=item.m_pItem;
 

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

     PrepareDC( dc );
     dc.SetLogicalFunction(wxINVERT);
 
     PrepareDC( dc );
     dc.SetLogicalFunction(wxINVERT);
 


@@ -1586,18 +1654,18 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
                 if (!prev)
                 {
                     prev = GetParent( m_key_current );
                 if (!prev)
                 {
                     prev = GetParent( m_key_current );

-                   if (prev)
-                   {
+                    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 );
                         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 );
+                            m_key_current=prev.m_pItem;
+                            EnsureVisible( prev );

                             break;
                             break;

-                       }
+                        }

                     }
                 }
                 if (prev)
                     }
                 }
                 if (prev)


@@ -1612,7 +1680,7 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
                     }
 
                     SelectItem( prev, unselect_others, extended_select );
                     }
 
                     SelectItem( prev, unselect_others, extended_select );

-                   m_key_current=prev.m_pItem;
+                    m_key_current=prev.m_pItem;

                     EnsureVisible( prev );
                 }
             }
                     EnsureVisible( prev );
                 }
             }


@@ -1643,13 +1711,14 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
                     long cookie = 0;
                     wxTreeItemId child = GetFirstChild( m_key_current, cookie );
                     SelectItem( child, unselect_others, extended_select );
                     long cookie = 0;
                     wxTreeItemId child = GetFirstChild( m_key_current, cookie );
                     SelectItem( child, unselect_others, extended_select );

-                   m_key_current=child.m_pItem;
+                    m_key_current=child.m_pItem;

                     EnsureVisible( child );
                 }
                 else
                 {
                     wxTreeItemId next = GetNextSibling( m_key_current );
                     EnsureVisible( child );
                 }
                 else
                 {
                     wxTreeItemId next = GetNextSibling( m_key_current );

-                    if (next == 0)
+//                    if (next == 0)
+                    if (!next)

                     {
                         wxTreeItemId current = m_key_current;
                         while (current && !next)
                     {
                         wxTreeItemId current = m_key_current;
                         while (current && !next)


@@ -1658,10 +1727,11 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
                             if (current) next = GetNextSibling( current );
                         }
                     }
                             if (current) next = GetNextSibling( current );
                         }
                     }

-                    if (next != 0)
+//                    if (next != 0)
+                    if (next)

                     {
                         SelectItem( next, unselect_others, extended_select );
                     {
                         SelectItem( next, unselect_others, extended_select );

-                       m_key_current=next.m_pItem;
+                        m_key_current=next.m_pItem;

                         EnsureVisible( next );
                     }
                 }
                         EnsureVisible( next );
                     }
                 }


@@ -1713,6 +1783,11 @@ void wxTreeCtrl::OnChar( wxKeyEvent &event )
 
 wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
 {
 
 wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
 {

+    // 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 );
     wxClientDC dc(this);
     PrepareDC(dc);
     long x = dc.DeviceToLogicalX( (long)point.x );


@@ -1729,10 +1804,77 @@ wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
     return m_anchor->HitTest( wxPoint(x, y), this, flags);
 }
 
     return m_anchor->HitTest( wxPoint(x, y), this, flags);
 }
 

-void wxTreeCtrl::OnMouse( wxMouseEvent &event )
+/* **** */
+
+void wxTreeCtrl::Edit( const wxTreeItemId& item )

 {
 {

-    if (!event.LeftIsDown()) m_dragCount = 0;
+    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;
+    if ((m_currentEdit->IsExpanded()) && (m_currentEdit->GetSelectedImage() != -1))
+    {
+        m_imageListNormal->GetSize( m_currentEdit->GetSelectedImage(), image_w, image_h );
+        image_w += 4;
+    }
+    else if (m_currentEdit->GetImage() != -1)
+    {
+        m_imageListNormal->GetSize( m_currentEdit->GetImage(), 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 )
+{

     if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return;
 
     if ( !m_anchor ) return;
     if ( !(event.LeftUp() || event.LeftDClick() || event.Dragging()) ) return;
 
     if ( !m_anchor ) return;


@@ -1746,23 +1888,36 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
     wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), this, flags);
     bool onButton = flags & wxTREE_HITTEST_ONITEMBUTTON;
 
     wxGenericTreeItem *item = m_anchor->HitTest( wxPoint(x,y), this, flags);
     bool onButton = flags & wxTREE_HITTEST_ONITEMBUTTON;
 

-    if (item == NULL) return;  /* we hit the blank area */
-

     if (event.Dragging())
     {
     if (event.Dragging())
     {

-        if (m_dragCount == 2)  /* small drag latency (3?) */
-        {
-            m_dragCount = 0;
+        if (m_dragCount == 0)
+           m_dragStart = wxPoint(x,y);
+       
+        m_dragCount++;
+       
+       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;
+    }

 
 

-            wxTreeEvent nevent(wxEVT_COMMAND_TREE_BEGIN_DRAG, GetId());
-            nevent.m_item = m_current;
-            nevent.SetEventObject(this);
-            GetEventHandler()->ProcessEvent(nevent);
-        }
-        else
-        {
-            m_dragCount++;
-        }
+    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;
     }
 
         return;
     }
 


@@ -1773,7 +1928,8 @@ void wxTreeCtrl::OnMouse( wxMouseEvent &event )
     if (onButton)
     {
         Toggle( item );
     if (onButton)
     {
         Toggle( item );

-       if (is_multiple) return;
+        if (is_multiple)
+            return;

     }
 
     SelectItem(item, unselect_others, extended_select);
     }
 
     SelectItem(item, unselect_others, extended_select);


@@ -1807,11 +1963,34 @@ void wxTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc )
 {
     long text_w = 0;
     long text_h = 0;
 {
     long text_w = 0;
     long text_h = 0;

-    // TODO : check for boldness. Here with suppose that font normal and bold
-    //        have the same height !
-    // TODO : bug here, text_w is sometime not the correct answer !!!
+
+    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(_T("wxDC::GetFont() failed!"));
+        }
+    }
+

     dc.GetTextExtent( item->GetText(), &text_w, &text_h );
     dc.GetTextExtent( item->GetText(), &text_w, &text_h );

-    text_h+=4;
+    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_h = 0;
     int image_w = 0;


@@ -1876,7 +2055,7 @@ void wxTreeCtrl::CalculatePositions()
     //if(GetImageList() == NULL)
     // m_lineHeight = (int)(dc.GetCharHeight() + 4);
 
     //if(GetImageList() == NULL)
     // m_lineHeight = (int)(dc.GetCharHeight() + 4);
 

-    int y = 2; //GetLineHeight(m_anchor) / 2 + 2;
+    int y = 2; 

     CalculateLevel( m_anchor, dc, 0, y ); // start recursion
 }
 
     CalculateLevel( m_anchor, dc, 0, y ); // start recursion
 }
 


@@ -1905,10 +2084,14 @@ void wxTreeCtrl::RefreshLine( wxGenericTreeItem *item )
     wxClientDC dc(this);
     PrepareDC( dc );
 
     wxClientDC dc(this);
     PrepareDC( dc );
 

+    int cw = 0;
+    int ch = 0;
+    GetClientSize( &cw, &ch );
+

     wxRect rect;
     wxRect rect;

-    rect.x = dc.LogicalToDeviceX( item->GetX() - 2 );
-    rect.y = dc.LogicalToDeviceY( item->GetY());
-    rect.width = 1000;
+    rect.x = dc.LogicalToDeviceX( 0 );
+    rect.y = dc.LogicalToDeviceY( item->GetY() );
+    rect.width = cw;

     rect.height = GetLineHeight(item); //dc.GetCharHeight() + 6;
 
     Refresh( TRUE, &rect );
     rect.height = GetLineHeight(item); //dc.GetCharHeight() + 6;
 
     Refresh( TRUE, &rect );