adapting keycode field usage for EVT_CHAR in unicode to MSW variant (full unicode...

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

diff --git a/src/generic/treectlg.cpp b/src/generic/treectlg.cpp
index 39d30b76147bfd97e8435b32026edacf82f8e2da..2e2650bfed959324dc2f106afce9c13b13fe13dc 100644 (file)
--- a/src/generic/treectlg.cpp
+++ b/src/generic/treectlg.cpp
@@ -17,10 +17,6 @@
 // headers
 // -----------------------------------------------------------------------------
 
 // headers
 // -----------------------------------------------------------------------------
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-  #pragma implementation "treectlg.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -31,6 +27,7 @@
 #if wxUSE_TREECTRL
 
 #include "wx/treebase.h"
 #if wxUSE_TREECTRL
 
 #include "wx/treebase.h"

+#include "wx/treectrl.h"

 #include "wx/generic/treectlg.h"
 #include "wx/timer.h"
 #include "wx/textctrl.h"
 #include "wx/generic/treectlg.h"
 #include "wx/timer.h"
 #include "wx/textctrl.h"


@@ -43,7 +40,7 @@
 #ifdef __WXMAC__
     #include "wx/mac/private.h"
 #endif
 #ifdef __WXMAC__
     #include "wx/mac/private.h"
 #endif

-    
+

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


@@ -60,6 +57,9 @@ static const int NO_IMAGE = -1;
 
 static const int PIXELS_PER_UNIT = 10;
 
 
 static const int PIXELS_PER_UNIT = 10;
 

+// the margin between the item image and the item text
+static const int MARGIN_BETWEEN_IMAGE_AND_TEXT = 4;
+

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


@@ -88,6 +88,31 @@ class WXDLLEXPORT wxTreeTextCtrl: public wxTextCtrl
 public:
     wxTreeTextCtrl(wxGenericTreeCtrl *owner, wxGenericTreeItem *item);
 
 public:
     wxTreeTextCtrl(wxGenericTreeCtrl *owner, wxGenericTreeItem *item);
 

+    void EndEdit(bool discardChanges = false)
+    {
+        if ( discardChanges )
+        {
+            StopEditing();
+        }
+        else
+        {
+            m_aboutToFinish = true;
+
+            // Notify the owner about the changes
+            AcceptChanges();
+
+            // Even if vetoed, close the control (consistent with MSW)
+            Finish();
+        }
+    }
+
+    void StopEditing()
+    {
+        Finish();
+        m_owner->OnRenameCancelled(m_itemEdited);
+    }
+    const wxGenericTreeItem* item() const { return m_itemEdited; }
+

 protected:
     void OnChar( wxKeyEvent &event );
     void OnKeyUp( wxKeyEvent &event );
 protected:
     void OnChar( wxKeyEvent &event );
     void OnKeyUp( wxKeyEvent &event );


@@ -101,6 +126,7 @@ private:
     wxGenericTreeItem  *m_itemEdited;
     wxString            m_startValue;
     bool                m_finished;
     wxGenericTreeItem  *m_itemEdited;
     wxString            m_startValue;
     bool                m_finished;

+    bool                m_aboutToFinish;

 
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxTreeTextCtrl)
 
     DECLARE_EVENT_TABLE()
     DECLARE_NO_COPY_CLASS(wxTreeTextCtrl)


@@ -154,7 +180,7 @@ public:
     void SetImage(int image, wxTreeItemIcon which) { m_images[which] = image; }
     void SetData(wxTreeItemData *data) { m_data = data; }
 
     void SetImage(int image, wxTreeItemIcon which) { m_images[which] = image; }
     void SetData(wxTreeItemData *data) { m_data = data; }
 

-    void SetHasPlus(bool has = TRUE) { m_hasPlus = has; }
+    void SetHasPlus(bool has = true) { m_hasPlus = has; }

 
     void SetBold(bool bold) { m_isBold = bold; }
 
 
     void SetBold(bool bold) { m_isBold = bold; }
 


@@ -178,7 +204,7 @@ public:
     void DeleteChildren(wxGenericTreeCtrl *tree = NULL);
 
     // get count of all children (and grand children if 'recursively')
     void DeleteChildren(wxGenericTreeCtrl *tree = NULL);
 
     // get count of all children (and grand children if 'recursively')

-    size_t GetChildrenCount(bool recursively = TRUE) const;
+    size_t GetChildrenCount(bool recursively = true) const;

 
     void Insert(wxGenericTreeItem *child, size_t index)
     { m_children.Insert(child, index); }
 
     void Insert(wxGenericTreeItem *child, size_t index)
     { m_children.Insert(child, index); }


@@ -186,17 +212,17 @@ public:
     void GetSize( int &x, int &y, const wxGenericTreeCtrl* );
 
         // return the item at given position (or NULL if no item), onButton is
     void GetSize( int &x, int &y, const wxGenericTreeCtrl* );
 
         // return the item at given position (or NULL if no item), onButton is

-        // TRUE if the point belongs to the item's button, otherwise it lies
+        // true if the point belongs to the item's button, otherwise it lies

         // on the item's label
     wxGenericTreeItem *HitTest( const wxPoint& point,
                                 const wxGenericTreeCtrl *,
                                 int &flags,
                                 int level );
 
         // on the item's label
     wxGenericTreeItem *HitTest( const wxPoint& point,
                                 const wxGenericTreeCtrl *,
                                 int &flags,
                                 int level );
 

-    void Expand() { m_isCollapsed = FALSE; }
-    void Collapse() { m_isCollapsed = TRUE; }
+    void Expand() { m_isCollapsed = false; }
+    void Collapse() { m_isCollapsed = true; }

 
 

-    void SetHilight( bool set = TRUE ) { m_hasHilight = set; }
+    void SetHilight( bool set = true ) { m_hasHilight = set; }

 
     // status inquiries
     bool HasChildren() const { return !m_children.IsEmpty(); }
 
     // status inquiries
     bool HasChildren() const { return !m_children.IsEmpty(); }


@@ -214,7 +240,7 @@ public:
         if ( !m_attr )
         {
             m_attr = new wxTreeItemAttr;
         if ( !m_attr )
         {
             m_attr = new wxTreeItemAttr;

-            m_ownsAttr = TRUE;
+            m_ownsAttr = true;

         }
         return *m_attr;
     }
         }
         return *m_attr;
     }


@@ -223,13 +249,13 @@ public:
     {
         if ( m_ownsAttr ) delete m_attr;
         m_attr = attr;
     {
         if ( m_ownsAttr ) delete m_attr;
         m_attr = attr;

-        m_ownsAttr = FALSE;
+        m_ownsAttr = false;

     }
         // set them and delete when done
     void AssignAttributes(wxTreeItemAttr *attr)
     {
         SetAttributes(attr);
     }
         // set them and delete when done
     void AssignAttributes(wxTreeItemAttr *attr)
     {
         SetAttributes(attr);

-        m_ownsAttr = TRUE;
+        m_ownsAttr = true;

     }
 
 private:
     }
 
 private:


@@ -247,20 +273,20 @@ private:
 
     // tree ctrl images for the normal, selected, expanded and
     // expanded+selected states
 
     // tree ctrl images for the normal, selected, expanded and
     // expanded+selected states

-    short               m_images[wxTreeItemIcon_Max];
+    int                 m_images[wxTreeItemIcon_Max];

 
     wxCoord             m_x;            // (virtual) offset from top
     wxCoord             m_y;            // (virtual) offset from left
 
     wxCoord             m_x;            // (virtual) offset from top
     wxCoord             m_y;            // (virtual) offset from left

-    short               m_width;        // width of this item
-    unsigned char       m_height;       // height of this item
+    int                 m_width;        // width of this item
+    int                 m_height;       // height of this item

 
     // use bitfields to save size
 
     // use bitfields to save size

-    int                 m_isCollapsed :1;
-    int                 m_hasHilight  :1; // same as focused
-    int                 m_hasPlus     :1; // used for item which doesn't have
+    unsigned int        m_isCollapsed :1;
+    unsigned int        m_hasHilight  :1; // same as focused
+    unsigned int        m_hasPlus     :1; // used for item which doesn't have

                                           // children but has a [+] button
                                           // children but has a [+] button

-    int                 m_isBold      :1; // render the label in bold font
-    int                 m_ownsAttr    :1; // delete attribute when done
+    unsigned int        m_isBold      :1; // render the label in bold font
+    unsigned int        m_ownsAttr    :1; // delete attribute when done

 
     DECLARE_NO_COPY_CLASS(wxGenericTreeItem)
 };
 
     DECLARE_NO_COPY_CLASS(wxGenericTreeItem)
 };


@@ -288,20 +314,20 @@ static void EventFlagsToSelType(long style,
 }
 
 // check if the given item is under another one
 }
 
 // check if the given item is under another one

-static bool IsDescendantOf(wxGenericTreeItem *parent, wxGenericTreeItem *item)
+static bool IsDescendantOf(const wxGenericTreeItem *parent, const wxGenericTreeItem *item)

 {
     while ( item )
     {
         if ( item == parent )
         {
             // item is a descendant of parent
 {
     while ( item )
     {
         if ( item == parent )
         {
             // item is a descendant of parent

-            return TRUE;
+            return true;

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

-    return FALSE;
+    return false;

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


@@ -333,7 +359,8 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
               : m_itemEdited(item), m_startValue(item->GetText())
 {
     m_owner = owner;
               : m_itemEdited(item), m_startValue(item->GetText())
 {
     m_owner = owner;

-    m_finished = FALSE;
+    m_finished = false;
+    m_aboutToFinish = false;

 
     int w = m_itemEdited->GetWidth(),
         h = m_itemEdited->GetHeight();
 
     int w = m_itemEdited->GetWidth(),
         h = m_itemEdited->GetHeight();


@@ -350,7 +377,7 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
         if ( m_owner->m_imageListNormal )
         {
             m_owner->m_imageListNormal->GetSize( image, image_w, image_h );
         if ( m_owner->m_imageListNormal )
         {
             m_owner->m_imageListNormal->GetSize( image, image_w, image_h );

-            image_w += 4;
+            image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;

         }
         else
         {
         }
         else
         {


@@ -361,6 +388,16 @@ wxTreeTextCtrl::wxTreeTextCtrl(wxGenericTreeCtrl *owner,
     // FIXME: what are all these hardcoded 4, 8 and 11s really?
     x += image_w;
     w -= image_w + 4;
     // FIXME: what are all these hardcoded 4, 8 and 11s really?
     x += image_w;
     w -= image_w + 4;

+#ifdef __WXMAC__
+    wxSize bs = DoGetBestSize() ;
+    // edit control height
+    if ( h > bs.y - 8 )
+    {
+        int diff = h - ( bs.y - 8 ) ;
+        h -= diff ;
+        y += diff / 2 ;
+    }
+#endif

 
     (void)Create(m_owner, wxID_ANY, m_startValue,
                  wxPoint(x - 4, y - 4), wxSize(w + 11, h + 8));
 
     (void)Create(m_owner, wxID_ANY, m_startValue,
                  wxPoint(x - 4, y - 4), wxSize(w + 11, h + 8));


@@ -373,32 +410,38 @@ bool wxTreeTextCtrl::AcceptChanges()
     if ( value == m_startValue )
     {
         // nothing changed, always accept
     if ( value == m_startValue )
     {
         // nothing changed, always accept

-        return TRUE;
+        // when an item remains unchanged, the owner
+        // needs to be notified that the user decided
+        // not to change the tree item label, and that
+        // the edit has been cancelled
+
+        m_owner->OnRenameCancelled(m_itemEdited);
+        return true;

     }
 
     if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
     {
         // vetoed by the user
     }
 
     if ( !m_owner->OnRenameAccept(m_itemEdited, value) )
     {
         // vetoed by the user

-        return FALSE;
+        return false;

     }
 
     // accepted, do rename the item
     m_owner->SetItemText(m_itemEdited, value);
 
     }
 
     // accepted, do rename the item
     m_owner->SetItemText(m_itemEdited, value);
 

-    return TRUE;
+    return true;

 }
 
 void wxTreeTextCtrl::Finish()
 {
 }
 
 void wxTreeTextCtrl::Finish()
 {

-    if ( !m_finished )
+    if ( !m_finished  )

     {
         m_owner->ResetTextControl();
 
         wxPendingDelete.Append(this);
 
     {
         m_owner->ResetTextControl();
 
         wxPendingDelete.Append(this);
 

-        m_finished = TRUE;
+        m_finished = true;

 
 

-        m_owner->SetFocus(); // This doesn't work. TODO.
+        m_owner->SetFocus();

     }
 }
 
     }
 }
 


@@ -407,16 +450,11 @@ void wxTreeTextCtrl::OnChar( wxKeyEvent &event )
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:
     switch ( event.m_keyCode )
     {
         case WXK_RETURN:

-            if ( !AcceptChanges() )
-            {
-                // vetoed by the user, don't disappear
-                break;
-            }
-            //else: fall through
+            EndEdit();
+            break;

 
         case WXK_ESCAPE:
 
         case WXK_ESCAPE:

-            Finish();
-            m_owner->OnRenameCancelled(m_itemEdited);
+            StopEditing();

             break;
 
         default:
             break;
 
         default:


@@ -438,7 +476,7 @@ void wxTreeTextCtrl::OnKeyUp( wxKeyEvent &event )
             sx = parentSize.x - myPos.x;
         if (mySize.x > sx)
             sx = mySize.x;
             sx = parentSize.x - myPos.x;
         if (mySize.x > sx)
             sx = mySize.x;

-        SetSize(sx, -1);
+        SetSize(sx, wxDefaultCoord);

     }
 
     event.Skip();
     }
 
     event.Skip();


@@ -446,16 +484,19 @@ void wxTreeTextCtrl::OnKeyUp( wxKeyEvent &event )
 
 void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &event )
 {
 
 void wxTreeTextCtrl::OnKillFocus( wxFocusEvent &event )
 {

-    if ( m_finished )
-    {
-        event.Skip();
-        return;
-    }
-
-    if ( AcceptChanges() )
+    if ( !m_finished && !m_aboutToFinish )

     {
     {

+        // We must finish regardless of success, otherwise we'll get
+        // focus problems:

         Finish();
         Finish();

+
+        if ( !AcceptChanges() )
+            m_owner->OnRenameCancelled( m_itemEdited );

     }
     }

+
+    // We must let the native text control handle focus, too, otherwise
+    // it could have problems with the cursor (e.g., in wxGTK).
+    event.Skip();

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


@@ -476,15 +517,15 @@ wxGenericTreeItem::wxGenericTreeItem(wxGenericTreeItem *parent,
     m_data = data;
     m_x = m_y = 0;
 
     m_data = data;
     m_x = m_y = 0;
 

-    m_isCollapsed = TRUE;
-    m_hasHilight = FALSE;
-    m_hasPlus = FALSE;
-    m_isBold = FALSE;
+    m_isCollapsed = true;
+    m_hasHilight = false;
+    m_hasPlus = false;
+    m_isBold = false;

 
     m_parent = parent;
 
     m_attr = (wxTreeItemAttr *)NULL;
 
     m_parent = parent;
 
     m_attr = (wxTreeItemAttr *)NULL;

-    m_ownsAttr = FALSE;
+    m_ownsAttr = false;

 
     // We don't know the height here yet.
     m_width = 0;
 
     // We don't know the height here yet.
     m_width = 0;


@@ -511,6 +552,8 @@ void wxGenericTreeItem::DeleteChildren(wxGenericTreeCtrl *tree)
             tree->SendDeleteEvent(child);
 
         child->DeleteChildren(tree);
             tree->SendDeleteEvent(child);
 
         child->DeleteChildren(tree);

+        if (child == tree->m_select_me)
+            tree->m_select_me = NULL;

         delete child;
     }
 
         delete child;
     }
 


@@ -670,15 +713,15 @@ int wxGenericTreeItem::GetCurrentImage() const
 // wxGenericTreeCtrl implementation
 // -----------------------------------------------------------------------------
 
 // wxGenericTreeCtrl implementation
 // -----------------------------------------------------------------------------
 

-IMPLEMENT_DYNAMIC_CLASS(wxGenericTreeCtrl, wxScrolledWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxGenericTreeCtrl, wxControl)

 
 

-BEGIN_EVENT_TABLE(wxGenericTreeCtrl,wxScrolledWindow)
+BEGIN_EVENT_TABLE(wxGenericTreeCtrl, wxTreeCtrlBase)

     EVT_PAINT          (wxGenericTreeCtrl::OnPaint)
     EVT_MOUSE_EVENTS   (wxGenericTreeCtrl::OnMouse)
     EVT_CHAR           (wxGenericTreeCtrl::OnChar)
     EVT_SET_FOCUS      (wxGenericTreeCtrl::OnSetFocus)
     EVT_KILL_FOCUS     (wxGenericTreeCtrl::OnKillFocus)
     EVT_PAINT          (wxGenericTreeCtrl::OnPaint)
     EVT_MOUSE_EVENTS   (wxGenericTreeCtrl::OnMouse)
     EVT_CHAR           (wxGenericTreeCtrl::OnChar)
     EVT_SET_FOCUS      (wxGenericTreeCtrl::OnSetFocus)
     EVT_KILL_FOCUS     (wxGenericTreeCtrl::OnKillFocus)

-    EVT_TREE_ITEM_GETTOOLTIP(-1, wxGenericTreeCtrl::OnGetToolTip)
+    EVT_TREE_ITEM_GETTOOLTIP(wxID_ANY, wxGenericTreeCtrl::OnGetToolTip)

 END_EVENT_TABLE()
 
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)
 END_EVENT_TABLE()
 
 #if !defined(__WXMSW__) || defined(__WXUNIVERSAL__)


@@ -696,9 +739,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxGenericTreeCtrl)
 
 void wxGenericTreeCtrl::Init()
 {
 
 void wxGenericTreeCtrl::Init()
 {

-    m_current = m_key_current = m_anchor = m_select_me = (wxGenericTreeItem *) NULL;
-    m_hasFocus = FALSE;
-    m_dirty = FALSE;
+    m_current =
+    m_key_current =
+    m_anchor =
+    m_select_me = (wxGenericTreeItem *) NULL;
+    m_hasFocus = false;
+    m_dirty = false;

 
     m_lineHeight = 10;
     m_indent = 15;
 
     m_lineHeight = 10;
     m_indent = 15;


@@ -722,13 +768,11 @@ void wxGenericTreeCtrl::Init()
                                  wxSOLID
                               );
 
                                  wxSOLID
                               );
 

-    m_imageListNormal = m_imageListButtons =
-    m_imageListState = (wxImageList *) NULL;
-    m_ownsImageListNormal = m_ownsImageListButtons =
-    m_ownsImageListState = FALSE;
+    m_imageListButtons = NULL;
+    m_ownsImageListButtons = false;

 
     m_dragCount = 0;
 
     m_dragCount = 0;

-    m_isDragging = FALSE;
+    m_isDragging = false;

     m_dropTarget = m_oldSelection = NULL;
     m_underMouse = NULL;
     m_textCtrl = NULL;
     m_dropTarget = m_oldSelection = NULL;
     m_underMouse = NULL;
     m_textCtrl = NULL;


@@ -738,9 +782,11 @@ void wxGenericTreeCtrl::Init()
 
     m_findTimer = NULL;
 
 
     m_findTimer = NULL;
 

-    m_lastOnSame = FALSE;
+    m_dropEffectAboveItem = false;
+
+    m_lastOnSame = false;

 
 

-#if defined( __WXMAC__ ) && __WXMAC_CARBON__
+#ifdef __WXMAC_CARBON__

     m_normalFont.MacCreateThemeFont( kThemeViewsFont ) ;
 #else
     m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
     m_normalFont.MacCreateThemeFont( kThemeViewsFont ) ;
 #else
     m_normalFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );


@@ -759,7 +805,7 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
                                const wxPoint& pos,
                                const wxSize& size,
                                long style,
                                const wxPoint& pos,
                                const wxSize& size,
                                long style,

-                               const wxValidator& wxVALIDATOR_PARAM(validator),
+                               const wxValidator& validator,

                                const wxString& name )
 {
 #ifdef __WXMAC__
                                const wxString& name )
 {
 #ifdef __WXMAC__


@@ -772,8 +818,11 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
         style |= wxTR_ROW_LINES;
 #endif // __WXMAC__
 
         style |= wxTR_ROW_LINES;
 #endif // __WXMAC__
 

-    wxScrolledWindow::Create( parent, id, pos, size,
-                              style|wxHSCROLL|wxVSCROLL, name );
+    if ( !wxControl::Create( parent, id, pos, size,
+                             style|wxHSCROLL|wxVSCROLL,
+                             validator,
+                             name ) )
+        return false;

 
     // If the tree display has no buttons, but does have
     // connecting lines, we can use a narrower layout.
 
     // If the tree display has no buttons, but does have
     // connecting lines, we can use a narrower layout.


@@ -784,21 +833,17 @@ bool wxGenericTreeCtrl::Create(wxWindow *parent,
         m_spacing = 10;
     }
 
         m_spacing = 10;
     }
 

-#if wxUSE_VALIDATORS
-    SetValidator( validator );
-#endif
-
-    wxVisualAttributes attr = GetDefaultAttributes();    
-    SetDefaultForegroundColour( attr.colFg );
-    SetDefaultBackgroundColour( attr.colBg );
-    SetDefaultFont(attr.font);
+    wxVisualAttributes attr = GetDefaultAttributes();
+    SetOwnForegroundColour( attr.colFg );
+    SetOwnBackgroundColour( attr.colBg );
+    if (!m_hasFont)
+        SetOwnFont(attr.font);

 
 

-//  m_dottedPen = wxPen( "grey", 0, wxDOT );  too slow under XFree86

     m_dottedPen = wxPen( wxT("grey"), 0, 0 );
 
     SetBestSize(size);
     m_dottedPen = wxPen( wxT("grey"), 0, 0 );
 
     SetBestSize(size);

-    
-    return TRUE;
+
+    return true;

 }
 
 wxGenericTreeCtrl::~wxGenericTreeCtrl()
 }
 
 wxGenericTreeCtrl::~wxGenericTreeCtrl()


@@ -811,10 +856,6 @@ wxGenericTreeCtrl::~wxGenericTreeCtrl()
     delete m_renameTimer;
     delete m_findTimer;
 
     delete m_renameTimer;
     delete m_findTimer;
 

-    if (m_ownsImageListNormal)
-        delete m_imageListNormal;
-    if (m_ownsImageListState)
-        delete m_imageListState;

     if (m_ownsImageListButtons)
         delete m_imageListButtons;
 }
     if (m_ownsImageListButtons)
         delete m_imageListButtons;
 }


@@ -844,13 +885,7 @@ size_t wxGenericTreeCtrl::GetCount() const
 void wxGenericTreeCtrl::SetIndent(unsigned int indent)
 {
     m_indent = (unsigned short) indent;
 void wxGenericTreeCtrl::SetIndent(unsigned int indent)
 {
     m_indent = (unsigned short) indent;

-    m_dirty = TRUE;
-}
-
-void wxGenericTreeCtrl::SetSpacing(unsigned int spacing)
-{
-    m_spacing = (unsigned short) spacing;
-    m_dirty = TRUE;
+    m_dirty = true;

 }
 
 size_t
 }
 
 size_t


@@ -864,7 +899,8 @@ wxGenericTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
 
 void wxGenericTreeCtrl::SetWindowStyle(const long styles)
 {
 
 void wxGenericTreeCtrl::SetWindowStyle(const long styles)
 {

-    if (!HasFlag(wxTR_HIDE_ROOT) && (styles & wxTR_HIDE_ROOT))
+    // Do not try to expand the root node if it hasn't been created yet
+    if (m_anchor && !HasFlag(wxTR_HIDE_ROOT) && (styles & wxTR_HIDE_ROOT))

     {
         // if we will hide the root, make sure children are visible
         m_anchor->SetHasPlus();
     {
         // if we will hide the root, make sure children are visible
         m_anchor->SetHasPlus();


@@ -876,7 +912,7 @@ void wxGenericTreeCtrl::SetWindowStyle(const long styles)
     // want to update the inherited styles, but right now
     // none of the parents has updatable styles
     m_windowStyle = styles;
     // want to update the inherited styles, but right now
     // none of the parents has updatable styles
     m_windowStyle = styles;

-    m_dirty = TRUE;
+    m_dirty = true;

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


@@ -885,7 +921,7 @@ void wxGenericTreeCtrl::SetWindowStyle(const long styles)
 
 wxString wxGenericTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {
 
 wxString wxGenericTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {

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

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


@@ -960,7 +996,7 @@ void wxGenericTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *da
 
     if (data)
         data->SetId( item );
 
     if (data)
         data->SetId( item );

-        
+

     ((wxGenericTreeItem*) item.m_pItem)->SetData(data);
 }
 
     ((wxGenericTreeItem*) item.m_pItem)->SetData(data);
 }
 


@@ -986,6 +1022,25 @@ void wxGenericTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
     }
 }
 
     }
 }
 

+void wxGenericTreeCtrl::SetItemDropHighlight(const wxTreeItemId& item,
+                                             bool highlight)
+{
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+    wxColour fg, bg;
+
+    if (highlight)
+    {
+        bg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT);
+        fg = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
+    }
+
+    wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;
+    pItem->Attr().SetTextColour(fg);
+    pItem->Attr().SetBackgroundColour(bg);
+    RefreshLine(pItem);
+}
+

 void wxGenericTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
                                    const wxColour& col)
 {
 void wxGenericTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
                                    const wxColour& col)
 {


@@ -1017,7 +1072,7 @@ void wxGenericTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font
 
 bool wxGenericTreeCtrl::SetFont( const wxFont &font )
 {
 
 bool wxGenericTreeCtrl::SetFont( const wxFont &font )
 {

-    wxScrolledWindow::SetFont(font);
+    wxTreeCtrlBase::SetFont(font);

 
     m_normalFont = font ;
     m_boldFont = wxFont(m_normalFont.GetPointSize(),
 
     m_normalFont = font ;
     m_boldFont = wxFont(m_normalFont.GetPointSize(),


@@ -1028,7 +1083,7 @@ bool wxGenericTreeCtrl::SetFont( const wxFont &font )
                         m_normalFont.GetFaceName(),
                         m_normalFont.GetEncoding());
 
                         m_normalFont.GetFaceName(),
                         m_normalFont.GetEncoding());
 

-    return TRUE;
+    return true;

 }
 
 
 }
 
 


@@ -1038,7 +1093,7 @@ bool wxGenericTreeCtrl::SetFont( const wxFont &font )
 
 bool wxGenericTreeCtrl::IsVisible(const wxTreeItemId& item) const
 {
 
 bool wxGenericTreeCtrl::IsVisible(const wxTreeItemId& item) const
 {

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

 
     // An item is only visible if it's not a descendant of a collapsed item
     wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;
 
     // An item is only visible if it's not a descendant of a collapsed item
     wxGenericTreeItem *pItem = (wxGenericTreeItem*) item.m_pItem;


@@ -1046,7 +1101,7 @@ bool wxGenericTreeCtrl::IsVisible(const wxTreeItemId& item) const
     while (parent)
     {
         if (!parent->IsExpanded())
     while (parent)
     {
         if (!parent->IsExpanded())

-            return FALSE;
+            return false;

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


@@ -1057,20 +1112,20 @@ bool wxGenericTreeCtrl::IsVisible(const wxTreeItemId& item) const
 
     wxRect rect;
     if (!GetBoundingRect(item, rect))
 
     wxRect rect;
     if (!GetBoundingRect(item, rect))

-        return FALSE;
+        return false;

     if (rect.GetWidth() == 0 || rect.GetHeight() == 0)
     if (rect.GetWidth() == 0 || rect.GetHeight() == 0)

-        return FALSE;
+        return false;

     if (rect.GetBottom() < 0 || rect.GetTop() > clientSize.y)
     if (rect.GetBottom() < 0 || rect.GetTop() > clientSize.y)

-        return FALSE;
+        return false;

     if (rect.GetRight() < 0 || rect.GetLeft() > clientSize.x)
     if (rect.GetRight() < 0 || rect.GetLeft() > clientSize.x)

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 {
 }
 
 bool wxGenericTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 {

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

 
     // consider that the item does have children if it has the "+" button: it
     // might not have them (if it had never been expanded yet) but then it
 
     // consider that the item does have children if it has the "+" button: it
     // might not have them (if it had never been expanded yet) but then it


@@ -1082,21 +1137,21 @@ bool wxGenericTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 
 bool wxGenericTreeCtrl::IsExpanded(const wxTreeItemId& item) const
 {
 
 bool wxGenericTreeCtrl::IsExpanded(const wxTreeItemId& item) const
 {

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

 
     return ((wxGenericTreeItem*) item.m_pItem)->IsExpanded();
 }
 
 bool wxGenericTreeCtrl::IsSelected(const wxTreeItemId& item) const
 {
 
     return ((wxGenericTreeItem*) item.m_pItem)->IsExpanded();
 }
 
 bool wxGenericTreeCtrl::IsSelected(const wxTreeItemId& item) const
 {

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

 
     return ((wxGenericTreeItem*) item.m_pItem)->IsSelected();
 }
 
 bool wxGenericTreeCtrl::IsBold(const wxTreeItemId& item) const
 {
 
     return ((wxGenericTreeItem*) item.m_pItem)->IsSelected();
 }
 
 bool wxGenericTreeCtrl::IsBold(const wxTreeItemId& item) const
 {

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

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


@@ -1291,7 +1346,7 @@ wxTreeItemId wxGenericTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 // called by wxTextTreeCtrl when it marks itself for deletion
 void wxGenericTreeCtrl::ResetTextControl()
 {
 // called by wxTextTreeCtrl when it marks itself for deletion
 void wxGenericTreeCtrl::ResetTextControl()
 {

-  m_textCtrl = NULL;
+    m_textCtrl = NULL;

 }
 
 // find the first item starting with the given prefix after the given item
 }
 
 // find the first item starting with the given prefix after the given item


@@ -1345,10 +1400,11 @@ wxTreeItemId wxGenericTreeCtrl::FindItem(const wxTreeItemId& idParent,
 // -----------------------------------------------------------------------------
 
 wxTreeItemId wxGenericTreeCtrl::DoInsertItem(const wxTreeItemId& parentId,
 // -----------------------------------------------------------------------------
 
 wxTreeItemId wxGenericTreeCtrl::DoInsertItem(const wxTreeItemId& parentId,

-                                      size_t previous,
-                                      const wxString& text,
-                                      int image, int selImage,
-                                      wxTreeItemData *data)
+                                             size_t previous,
+                                             const wxString& text,
+                                             int image,
+                                             int selImage,
+                                             wxTreeItemData *data)

 {
     wxGenericTreeItem *parent = (wxGenericTreeItem*) parentId.m_pItem;
     if ( !parent )
 {
     wxGenericTreeItem *parent = (wxGenericTreeItem*) parentId.m_pItem;
     if ( !parent )


@@ -1357,7 +1413,7 @@ wxTreeItemId wxGenericTreeCtrl::DoInsertItem(const wxTreeItemId& parentId,
         return AddRoot(text, image, selImage, data);
     }
 
         return AddRoot(text, image, selImage, data);
     }
 

-    m_dirty = TRUE;     // do this first so stuff below doesn't cause flicker
+    m_dirty = true;     // do this first so stuff below doesn't cause flicker

 
     wxGenericTreeItem *item =
         new wxGenericTreeItem( parent, text, image, selImage, data );
 
     wxGenericTreeItem *item =
         new wxGenericTreeItem( parent, text, image, selImage, data );


@@ -1367,18 +1423,20 @@ wxTreeItemId wxGenericTreeCtrl::DoInsertItem(const wxTreeItemId& parentId,
         data->m_pItem = item;
     }
 
         data->m_pItem = item;
     }
 

-    parent->Insert( item, previous );
+    parent->Insert( item, previous == (size_t)-1 ? parent->GetChildren().size()
+                                                 : previous );

 
     return item;
 }
 
 wxTreeItemId wxGenericTreeCtrl::AddRoot(const wxString& text,
 
     return item;
 }
 
 wxTreeItemId wxGenericTreeCtrl::AddRoot(const wxString& text,

-                                 int image, int selImage,
-                                 wxTreeItemData *data)
+                                        int image,
+                                        int selImage,
+                                        wxTreeItemData *data)

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

-    m_dirty = TRUE;     // do this first so stuff below doesn't cause flicker
+    m_dirty = true;     // do this first so stuff below doesn't cause flicker

 
     m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text,
                                    image, selImage, data);
 
     m_anchor = new wxGenericTreeItem((wxGenericTreeItem *)NULL, text,
                                    image, selImage, data);


@@ -1399,25 +1457,17 @@ wxTreeItemId wxGenericTreeCtrl::AddRoot(const wxString& text,
     if (!HasFlag(wxTR_MULTIPLE))
     {
         m_current = m_key_current = m_anchor;
     if (!HasFlag(wxTR_MULTIPLE))
     {
         m_current = m_key_current = m_anchor;

-        m_current->SetHilight( TRUE );
+        m_current->SetHilight( true );

     }
 
     return m_anchor;
 }
 
     }
 
     return m_anchor;
 }
 

-wxTreeItemId wxGenericTreeCtrl::PrependItem(const wxTreeItemId& parent,
-                                     const wxString& text,
-                                     int image, int selImage,
-                                     wxTreeItemData *data)
-{
-    return DoInsertItem(parent, 0u, text, image, selImage, data);
-}
-
-wxTreeItemId wxGenericTreeCtrl::InsertItem(const wxTreeItemId& parentId,
-                                    const wxTreeItemId& idPrevious,
-                                    const wxString& text,
-                                    int image, int selImage,
-                                    wxTreeItemData *data)
+wxTreeItemId wxGenericTreeCtrl::DoInsertAfter(const wxTreeItemId& parentId,
+                                              const wxTreeItemId& idPrevious,
+                                              const wxString& text,
+                                              int image, int selImage,
+                                              wxTreeItemData *data)

 {
     wxGenericTreeItem *parent = (wxGenericTreeItem*) parentId.m_pItem;
     if ( !parent )
 {
     wxGenericTreeItem *parent = (wxGenericTreeItem*) parentId.m_pItem;
     if ( !parent )


@@ -1437,37 +1487,6 @@ wxTreeItemId wxGenericTreeCtrl::InsertItem(const wxTreeItemId& parentId,
     return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);
 }
 
     return DoInsertItem(parentId, (size_t)++index, text, image, selImage, data);
 }
 

-wxTreeItemId wxGenericTreeCtrl::InsertItem(const wxTreeItemId& parentId,
-                                    size_t before,
-                                    const wxString& text,
-                                    int image, int selImage,
-                                    wxTreeItemData *data)
-{
-    wxGenericTreeItem *parent = (wxGenericTreeItem*) parentId.m_pItem;
-    if ( !parent )
-    {
-        // should we give a warning here?
-        return AddRoot(text, image, selImage, data);
-    }
-
-    return DoInsertItem(parentId, before, text, image, selImage, data);
-}
-
-wxTreeItemId wxGenericTreeCtrl::AppendItem(const wxTreeItemId& parentId,
-                                    const wxString& text,
-                                    int image, int selImage,
-                                    wxTreeItemData *data)
-{
-    wxGenericTreeItem *parent = (wxGenericTreeItem*) parentId.m_pItem;
-    if ( !parent )
-    {
-        // should we give a warning here?
-        return AddRoot(text, image, selImage, data);
-    }
-
-    return DoInsertItem( parent, parent->GetChildren().Count(), text,
-                         image, selImage, data);
-}

 
 void wxGenericTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)
 {
 
 void wxGenericTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)
 {


@@ -1477,20 +1496,46 @@ void wxGenericTreeCtrl::SendDeleteEvent(wxGenericTreeItem *item)
     ProcessEvent( event );
 }
 
     ProcessEvent( event );
 }
 

+// Don't leave edit or selection on a child which is about to disappear
+void wxGenericTreeCtrl::ChildrenClosing(wxGenericTreeItem* item)
+{
+    if (m_textCtrl != NULL && item != m_textCtrl->item() && IsDescendantOf(item, m_textCtrl->item())) {
+        m_textCtrl->StopEditing();
+    }
+    if (item != m_key_current && IsDescendantOf(item, m_key_current)) {
+        m_key_current = NULL;
+    }
+    if (IsDescendantOf(item, m_select_me)) {
+        m_select_me = item;
+    }
+    if (item != m_current && IsDescendantOf(item, m_current)) {
+        m_current->SetHilight( false );
+        m_current = NULL;
+        m_select_me = item;
+    }
+}
+

 void wxGenericTreeCtrl::DeleteChildren(const wxTreeItemId& itemId)
 {
 void wxGenericTreeCtrl::DeleteChildren(const wxTreeItemId& itemId)
 {

-    m_dirty = TRUE;     // do this first so stuff below doesn't cause flicker
+    m_dirty = true;     // do this first so stuff below doesn't cause flicker

 
     wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
 
     wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;

+    ChildrenClosing(item);

     item->DeleteChildren(this);
 }
 
 void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
 {
     item->DeleteChildren(this);
 }
 
 void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
 {

-    m_dirty = TRUE;     // do this first so stuff below doesn't cause flicker
+    m_dirty = true;     // do this first so stuff below doesn't cause flicker

 
     wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
 
 
     wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
 

+    if (m_textCtrl != NULL && IsDescendantOf(item, m_textCtrl->item()))
+    {
+        // can't delete the item being edited, cancel editing it first
+        m_textCtrl->StopEditing();
+    }
+

     wxGenericTreeItem *parent = item->GetParent();
 
     // don't keep stale pointers around!
     wxGenericTreeItem *parent = item->GetParent();
 
     // don't keep stale pointers around!


@@ -1499,7 +1544,7 @@ void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
         // Don't silently change the selection:
         // do it properly in idle time, so event
         // handlers get called.
         // Don't silently change the selection:
         // do it properly in idle time, so event
         // handlers get called.

-        
+

         // m_key_current = parent;
         m_key_current = NULL;
     }
         // m_key_current = parent;
         m_key_current = NULL;
     }


@@ -1516,7 +1561,7 @@ void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
         // Don't silently change the selection:
         // do it properly in idle time, so event
         // handlers get called.
         // Don't silently change the selection:
         // do it properly in idle time, so event
         // handlers get called.

-        
+

         // m_current = parent;
         m_current = NULL;
         m_select_me = parent;
         // m_current = parent;
         m_current = NULL;
         m_select_me = parent;


@@ -1536,6 +1581,10 @@ void wxGenericTreeCtrl::Delete(const wxTreeItemId& itemId)
     // and delete all of its children and the item itself now
     item->DeleteChildren(this);
     SendDeleteEvent(item);
     // and delete all of its children and the item itself now
     item->DeleteChildren(this);
     SendDeleteEvent(item);

+
+    if (item == m_select_me)
+        m_select_me = NULL;
+

     delete item;
 }
 
     delete item;
 }
 


@@ -1618,6 +1667,7 @@ void wxGenericTreeCtrl::Collapse(const wxTreeItemId& itemId)
         return;
     }
 
         return;
     }
 

+    ChildrenClosing(item);

     item->Collapse();
 
 #if 0  // TODO why should items be collapsed recursively?
     item->Collapse();
 
 #if 0  // TODO why should items be collapsed recursively?


@@ -1657,7 +1707,7 @@ void wxGenericTreeCtrl::Unselect()
 {
     if (m_current)
     {
 {
     if (m_current)
     {

-        m_current->SetHilight( FALSE );
+        m_current->SetHilight( false );

         RefreshLine( m_current );
 
         m_current = NULL;
         RefreshLine( m_current );
 
         m_current = NULL;


@@ -1669,7 +1719,7 @@ void wxGenericTreeCtrl::UnselectAllChildren(wxGenericTreeItem *item)
 {
     if (item->IsSelected())
     {
 {
     if (item->IsSelected())
     {

-        item->SetHilight(FALSE);
+        item->SetHilight(false);

         RefreshLine(item);
     }
 
         RefreshLine(item);
     }
 


@@ -1715,7 +1765,7 @@ bool wxGenericTreeCtrl::TagNextChildren(wxGenericTreeItem *crt_item, wxGenericTr
     size_t count = children.Count();
     for (size_t n=(size_t)(index+1); n<count; ++n)
     {
     size_t count = children.Count();
     for (size_t n=(size_t)(index+1); n<count; ++n)
     {

-        if (TagAllChildrenUntilLast(children[n], last_item, select)) return TRUE;
+        if (TagAllChildrenUntilLast(children[n], last_item, select)) return true;

     }
 
     return TagNextChildren(parent, last_item, select);
     }
 
     return TagNextChildren(parent, last_item, select);


@@ -1727,7 +1777,7 @@ bool wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxG
     RefreshLine(crt_item);
 
     if (crt_item==last_item)
     RefreshLine(crt_item);
 
     if (crt_item==last_item)

-        return TRUE;
+        return true;

 
     if (crt_item->HasChildren())
     {
 
     if (crt_item->HasChildren())
     {


@@ -1736,11 +1786,11 @@ bool wxGenericTreeCtrl::TagAllChildrenUntilLast(wxGenericTreeItem *crt_item, wxG
         for ( size_t n = 0; n < count; ++n )
         {
             if (TagAllChildrenUntilLast(children[n], last_item, select))
         for ( size_t n = 0; n < count; ++n )
         {
             if (TagAllChildrenUntilLast(children[n], last_item, select))

-                return TRUE;
+                return true;

         }
     }
 
         }
     }
 

-  return FALSE;
+  return false;

 }
 
 void wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *item2)
 }
 
 void wxGenericTreeCtrl::SelectItemRange(wxGenericTreeItem *item1, wxGenericTreeItem *item2)


@@ -1767,7 +1817,7 @@ void wxGenericTreeCtrl::DoSelectItem(const wxTreeItemId& itemId,
     wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") );
 
     m_select_me = NULL;
     wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") );
 
     m_select_me = NULL;

-    
+

     bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE);
     wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
 
     bool is_single=!(GetWindowStyleFlag() & wxTR_MULTIPLE);
     wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
 


@@ -1779,8 +1829,8 @@ void wxGenericTreeCtrl::DoSelectItem(const wxTreeItemId& itemId,
     {
         if (item->IsSelected())
             return; // nothing to do
     {
         if (item->IsSelected())
             return; // nothing to do

-        unselect_others = TRUE;
-        extended_select = FALSE;
+        unselect_others = true;
+        extended_select = false;

     }
     else if ( unselect_others && item->IsSelected() )
     {
     }
     else if ( unselect_others && item->IsSelected() )
     {


@@ -1808,8 +1858,6 @@ void wxGenericTreeCtrl::DoSelectItem(const wxTreeItemId& itemId,
         parent = GetItemParent( parent );
     }
 
         parent = GetItemParent( parent );
     }
 

-    EnsureVisible( itemId );
-

     // ctrl press
     if (unselect_others)
     {
     // ctrl press
     if (unselect_others)
     {


@@ -1830,7 +1878,7 @@ void wxGenericTreeCtrl::DoSelectItem(const wxTreeItemId& itemId,
     }
     else
     {
     }
     else
     {

-        bool select=TRUE; // the default
+        bool select = true; // the default

 
         // Check if we need to toggle hilight (ctrl mode)
         if (!unselect_others)
 
         // Check if we need to toggle hilight (ctrl mode)
         if (!unselect_others)


@@ -1841,6 +1889,11 @@ void wxGenericTreeCtrl::DoSelectItem(const wxTreeItemId& itemId,
         RefreshLine( m_current );
     }
 
         RefreshLine( m_current );
     }
 

+    // This can cause idle processing to select the root
+    // if no item is selected, so it must be after the
+    // selection is set
+    EnsureVisible( itemId );
+

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


@@ -1849,14 +1902,14 @@ void wxGenericTreeCtrl::SelectItem(const wxTreeItemId& itemId, bool select)
 {
     if ( select )
     {
 {
     if ( select )
     {

-        DoSelectItem(itemId);
+        DoSelectItem(itemId, !HasFlag(wxTR_MULTIPLE));

     }
     else // deselect
     {
         wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
         wxCHECK_RET( item, wxT("SelectItem(): invalid tree item") );
 
     }
     else // deselect
     {
         wxGenericTreeItem *item = (wxGenericTreeItem*) itemId.m_pItem;
         wxCHECK_RET( item, wxT("SelectItem(): invalid tree item") );
 

-        item->SetHilight(FALSE);
+        item->SetHilight(false);

         RefreshLine(item);
     }
 }
         RefreshLine(item);
     }
 }


@@ -1929,7 +1982,7 @@ void wxGenericTreeCtrl::ScrollTo(const wxTreeItemId &item)
     // We have to call this here because the label in
     // question might just have been added and no screen
     // update taken place.
     // 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) 
+    if (m_dirty)

 #if defined( __WXMSW__ ) || defined(__WXMAC__)
         Update();
 #else
 #if defined( __WXMSW__ ) || defined(__WXMAC__)
         Update();
 #else


@@ -1987,12 +2040,6 @@ static int LINKAGEMODE tree_ctrl_compare_func(wxGenericTreeItem **item1,
     return s_treeBeingSorted->OnCompareItems(*item1, *item2);
 }
 
     return s_treeBeingSorted->OnCompareItems(*item1, *item2);
 }
 

-int wxGenericTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
-                               const wxTreeItemId& item2)
-{
-    return wxStrcmp(GetItemText(item1), GetItemText(item2));
-}
-

 void wxGenericTreeCtrl::SortChildren(const wxTreeItemId& itemId)
 {
     wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") );
 void wxGenericTreeCtrl::SortChildren(const wxTreeItemId& itemId)
 {
     wxCHECK_RET( itemId.IsOk(), wxT("invalid tree item") );


@@ -2005,7 +2052,7 @@ void wxGenericTreeCtrl::SortChildren(const wxTreeItemId& itemId)
     wxArrayGenericTreeItems& children = item->GetChildren();
     if ( children.Count() > 1 )
     {
     wxArrayGenericTreeItems& children = item->GetChildren();
     if ( children.Count() > 1 )
     {

-        m_dirty = TRUE;
+        m_dirty = true;

 
         s_treeBeingSorted = this;
         children.Sort(tree_ctrl_compare_func);
 
         s_treeBeingSorted = this;
         children.Sort(tree_ctrl_compare_func);


@@ -2014,21 +2061,6 @@ void wxGenericTreeCtrl::SortChildren(const wxTreeItemId& itemId)
     //else: don't make the tree dirty as nothing changed
 }
 
     //else: don't make the tree dirty as nothing changed
 }
 

-wxImageList *wxGenericTreeCtrl::GetImageList() const
-{
-    return m_imageListNormal;
-}
-
-wxImageList *wxGenericTreeCtrl::GetButtonsImageList() const
-{
-    return m_imageListButtons;
-}
-
-wxImageList *wxGenericTreeCtrl::GetStateImageList() const
-{
-    return m_imageListState;
-}
-

 void wxGenericTreeCtrl::CalculateLineHeight()
 {
     wxClientDC dc(this);
 void wxGenericTreeCtrl::CalculateLineHeight()
 {
     wxClientDC dc(this);


@@ -2072,8 +2104,8 @@ void wxGenericTreeCtrl::SetImageList(wxImageList *imageList)
 {
     if (m_ownsImageListNormal) delete m_imageListNormal;
     m_imageListNormal = imageList;
 {
     if (m_ownsImageListNormal) delete m_imageListNormal;
     m_imageListNormal = imageList;

-    m_ownsImageListNormal = FALSE;
-    m_dirty = TRUE;
+    m_ownsImageListNormal = false;
+    m_dirty = true;

     // Don't do any drawing if we're setting the list to NULL,
     // since we may be in the process of deleting the tree control.
     if (imageList)
     // Don't do any drawing if we're setting the list to NULL,
     // since we may be in the process of deleting the tree control.
     if (imageList)


@@ -2084,34 +2116,22 @@ void wxGenericTreeCtrl::SetStateImageList(wxImageList *imageList)
 {
     if (m_ownsImageListState) delete m_imageListState;
     m_imageListState = imageList;
 {
     if (m_ownsImageListState) delete m_imageListState;
     m_imageListState = imageList;

-    m_ownsImageListState = FALSE;
+    m_ownsImageListState = false;

 }
 
 void wxGenericTreeCtrl::SetButtonsImageList(wxImageList *imageList)
 {
     if (m_ownsImageListButtons) delete m_imageListButtons;
     m_imageListButtons = imageList;
 }
 
 void wxGenericTreeCtrl::SetButtonsImageList(wxImageList *imageList)
 {
     if (m_ownsImageListButtons) delete m_imageListButtons;
     m_imageListButtons = imageList;

-    m_ownsImageListButtons = FALSE;
-    m_dirty = TRUE;
+    m_ownsImageListButtons = false;
+    m_dirty = true;

     CalculateLineHeight();
 }
 
     CalculateLineHeight();
 }
 

-void wxGenericTreeCtrl::AssignImageList(wxImageList *imageList)
-{
-    SetImageList(imageList);
-    m_ownsImageListNormal = TRUE;
-}
-
-void wxGenericTreeCtrl::AssignStateImageList(wxImageList *imageList)
-{
-    SetStateImageList(imageList);
-    m_ownsImageListState = TRUE;
-}
-

 void wxGenericTreeCtrl::AssignButtonsImageList(wxImageList *imageList)
 {
     SetButtonsImageList(imageList);
 void wxGenericTreeCtrl::AssignButtonsImageList(wxImageList *imageList)
 {
     SetButtonsImageList(imageList);

-    m_ownsImageListButtons = TRUE;
+    m_ownsImageListButtons = true;

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


@@ -2164,7 +2184,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
         if ( m_imageListNormal )
         {
             m_imageListNormal->GetSize( image, image_w, image_h );
         if ( m_imageListNormal )
         {
             m_imageListNormal->GetSize( image, image_w, image_h );

-            image_w += 4;
+            image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;

         }
         else
         {
         }
         else
         {


@@ -2173,6 +2193,7 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
     }
 
     int total_h = GetLineHeight(item);
     }
 
     int total_h = GetLineHeight(item);

+    bool drawItemBackground = false;

 
     if ( item->IsSelected() )
     {
 
     if ( item->IsSelected() )
     {


@@ -2190,14 +2211,20 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
 #else
         dc.SetBrush(*(m_hasFocus ? m_hilightBrush : m_hilightUnfocusedBrush));
 #endif
 #else
         dc.SetBrush(*(m_hasFocus ? m_hilightBrush : m_hilightUnfocusedBrush));
 #endif

+        drawItemBackground = true;

     }
     else
     {
         wxColour colBg;
         if ( attr && attr->HasBackgroundColour() )
     }
     else
     {
         wxColour colBg;
         if ( attr && attr->HasBackgroundColour() )

+        {
+            drawItemBackground = true;

             colBg = attr->GetBackgroundColour();
             colBg = attr->GetBackgroundColour();

+        }

         else
         else

-            colBg = m_backgroundColour;
+        {
+            colBg = GetBackgroundColour();
+        }

         dc.SetBrush(wxBrush(colBg, wxSOLID));
     }
 
         dc.SetBrush(wxBrush(colBg, wxSOLID));
     }
 


@@ -2221,7 +2248,10 @@ void wxGenericTreeCtrl::PaintItem(wxGenericTreeItem *item, wxDC& dc)
             dc.DrawRectangle( item->GetX() + image_w - 2, item->GetY()+offset,
                               item->GetWidth() - image_w + 2, total_h-offset );
         }
             dc.DrawRectangle( item->GetX() + image_w - 2, item->GetY()+offset,
                               item->GetWidth() - image_w + 2, total_h-offset );
         }

-        else
+        // On GTK+ 2, drawing a 'normal' background is wrong for themes that
+        // don't allow backgrounds to be customized. Not drawing the background,
+        // except for custom item backgrounds, works for both kinds of theme.
+        else if (drawItemBackground)

         {
             dc.DrawRectangle( item->GetX()-2, item->GetY()+offset,
                               item->GetWidth()+2, total_h-offset );
         {
             dc.DrawRectangle( item->GetX()-2, item->GetY()+offset,
                               item->GetWidth()+2, total_h-offset );


@@ -2303,7 +2333,15 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
             wxTRANSPARENT_PEN;
 
         wxColour colText;
             wxTRANSPARENT_PEN;
 
         wxColour colText;

-        if ( item->IsSelected() )
+        if ( item->IsSelected()
+#ifdef __WXMAC__
+            // On wxMac, if the tree doesn't have the focus we draw an empty
+            // rectangle, so we want to make sure that the text is visible
+            // against the normal background, not the highlightbackground, so
+            // don't use the highlight text colour unless we have the focus.
+             && m_hasFocus
+#endif
+            )

         {
             colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
         }
         {
             colText = wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHTTEXT);
         }


@@ -2374,13 +2412,13 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
             {
                 static const int wImage = 9;
                 static const int hImage = 9;
             {
                 static const int wImage = 9;
                 static const int hImage = 9;

-                
+

                 int flag = 0;
                 if (item->IsExpanded())
                     flag |= wxCONTROL_EXPANDED;
                 if (item == m_underMouse)
                     flag |= wxCONTROL_CURRENT;
                 int flag = 0;
                 if (item->IsExpanded())
                     flag |= wxCONTROL_EXPANDED;
                 if (item == m_underMouse)
                     flag |= wxCONTROL_CURRENT;

-                                            
+

                 wxRendererNative::Get().DrawTreeItemButton
                                         (
                                             this,
                 wxRendererNative::Get().DrawTreeItemButton
                                         (
                                             this,


@@ -2414,7 +2452,7 @@ void wxGenericTreeCtrl::PaintLevel( wxGenericTreeItem *item, wxDC &dc, int level
                 if (HasButtons()) y_mid += 5;
 
                 // Only draw the portion of the line that is visible, in case it is huge
                 if (HasButtons()) y_mid += 5;
 
                 // Only draw the portion of the line that is visible, in case it is huge

-                wxCoord        xOrigin=0, yOrigin=0, width, height;
+                wxCoord xOrigin=0, yOrigin=0, width, height;

                 dc.GetDeviceOrigin(&xOrigin, &yOrigin);
                 yOrigin = abs(yOrigin);
                 GetClientSize(&width, &height);
                 dc.GetDeviceOrigin(&xOrigin, &yOrigin);
                 yOrigin = abs(yOrigin);
                 GetClientSize(&width, &height);


@@ -2447,7 +2485,7 @@ void wxGenericTreeCtrl::DrawDropEffect(wxGenericTreeItem *item)
         {
             // draw a line under the drop target because the item will be
             // dropped there
         {
             // draw a line under the drop target because the item will be
             // dropped there

-            DrawLine(item, TRUE /* below */);
+            DrawLine(item, !m_dropEffectAboveItem );

         }
 
         SetCursor(wxCURSOR_BULLSEYE);
         }
 
         SetCursor(wxCURSOR_BULLSEYE);


@@ -2521,7 +2559,7 @@ void wxGenericTreeCtrl::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
 void wxGenericTreeCtrl::OnSetFocus( wxFocusEvent &event )
 {
 
 void wxGenericTreeCtrl::OnSetFocus( wxFocusEvent &event )
 {

-    m_hasFocus = TRUE;
+    m_hasFocus = true;

 
     RefreshSelected();
 
 
     RefreshSelected();
 


@@ -2530,7 +2568,7 @@ void wxGenericTreeCtrl::OnSetFocus( wxFocusEvent &event )
 
 void wxGenericTreeCtrl::OnKillFocus( wxFocusEvent &event )
 {
 
 void wxGenericTreeCtrl::OnKillFocus( wxFocusEvent &event )
 {

-    m_hasFocus = FALSE;
+    m_hasFocus = false;

 
     RefreshSelected();
 
 
     RefreshSelected();
 


@@ -2558,7 +2596,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
     bool is_multiple, extended_select, unselect_others;
     EventFlagsToSelType(GetWindowStyleFlag(),
                         event.ShiftDown(),
     bool is_multiple, extended_select, unselect_others;
     EventFlagsToSelType(GetWindowStyleFlag(),
                         event.ShiftDown(),

-                        event.ControlDown(),
+                        event.CmdDown(),

                         is_multiple, extended_select, unselect_others);
 
     // + : Expand
                         is_multiple, extended_select, unselect_others);
 
     // + : Expand


@@ -2601,14 +2639,29 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
             }
             break;
 
             }
             break;
 

+        case WXK_MENU:
+            {
+                // Use the item's bounding rectangle to determine position for the event
+                wxRect ItemRect;
+                GetBoundingRect(m_current, ItemRect, true);
+
+                wxTreeEvent eventMenu( wxEVT_COMMAND_TREE_ITEM_MENU, GetId() );
+                eventMenu.m_item = m_current;
+                // Use the left edge, vertical middle
+                eventMenu.m_pointDrag = wxPoint(ItemRect.GetX(),
+                                                ItemRect.GetY() + ItemRect.GetHeight() / 2);
+                eventMenu.SetEventObject( this );
+                GetEventHandler()->ProcessEvent( eventMenu );
+                break;
+            }

         case ' ':
         case WXK_RETURN:
             if ( !event.HasModifiers() )
             {
         case ' ':
         case WXK_RETURN:
             if ( !event.HasModifiers() )
             {

-                wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
-                event.m_item = m_current;
-                event.SetEventObject( this );
-                GetEventHandler()->ProcessEvent( event );
+                wxTreeEvent eventAct( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
+                eventAct.m_item = m_current;
+                eventAct.SetEventObject( this );
+                GetEventHandler()->ProcessEvent( eventAct );

             }
 
             // in any case, also generate the normal key event for this key,
             }
 
             // in any case, also generate the normal key event for this key,


@@ -2725,7 +2778,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
 
                     // it may happen if the item was expanded but then all of
                     // its children have been deleted - so IsExpanded() returned
 
                     // 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
+                    // true, but GetLastChild() returned invalid item

                     if ( !lastChild )
                         break;
 
                     if ( !lastChild )
                         break;
 


@@ -2766,9 +2819,9 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
                   (keyCode >= 'A' && keyCode <= 'Z' )))
             {
                 // find the next item starting with the given prefix
                   (keyCode >= 'A' && keyCode <= 'Z' )))
             {
                 // find the next item starting with the given prefix

-                char ch = (char)keyCode;
+                wxChar ch = (wxChar)keyCode;

 
 

-                wxTreeItemId id = FindItem(m_current, m_findPrefix + (wxChar)ch);
+                wxTreeItemId id = FindItem(m_current, m_findPrefix + ch);

                 if ( !id.IsOk() )
                 {
                     // no such item
                 if ( !id.IsOk() )
                 {
                     // no such item


@@ -2796,7 +2849,7 @@ void wxGenericTreeCtrl::OnChar( wxKeyEvent &event )
     }
 }
 
     }
 }
 

-wxTreeItemId wxGenericTreeCtrl::HitTest(const wxPoint& point, int& flags)
+wxTreeItemId wxGenericTreeCtrl::DoTreeHitTest(const wxPoint& point, int& flags)

 {
     // JACS: removed wxYieldIfNeeded() because it can cause the window
     // to be deleted from under us if a close window event is pending
 {
     // JACS: removed wxYieldIfNeeded() because it can cause the window
     // to be deleted from under us if a close window event is pending


@@ -2829,27 +2882,43 @@ wxTreeItemId wxGenericTreeCtrl::HitTest(const wxPoint& point, int& flags)
 // get the bounding rectangle of the item (or of its label only)
 bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
                                         wxRect& rect,
 // get the bounding rectangle of the item (or of its label only)
 bool wxGenericTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
                                         wxRect& rect,

-                                        bool WXUNUSED(textOnly)) const
+                                        bool textOnly) const

 {
 {

-    wxCHECK_MSG( item.IsOk(), FALSE, _T("invalid item in wxGenericTreeCtrl::GetBoundingRect") );
+    wxCHECK_MSG( item.IsOk(), false, _T("invalid item in wxGenericTreeCtrl::GetBoundingRect") );

 
     wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem;
 
     int startX, startY;
     GetViewStart(& startX, & startY);
 
 
     wxGenericTreeItem *i = (wxGenericTreeItem*) item.m_pItem;
 
     int startX, startY;
     GetViewStart(& startX, & startY);
 

-    rect.x = i->GetX() - startX*PIXELS_PER_UNIT;
+    if ( textOnly )
+    {
+        rect.x = i->GetX() - startX*PIXELS_PER_UNIT;
+        rect.width = i->GetWidth();
+
+        if ( m_imageListNormal )
+        {
+            int image_w, image_h;
+            m_imageListNormal->GetSize( 0, image_w, image_h );
+            rect.width += image_w + MARGIN_BETWEEN_IMAGE_AND_TEXT;
+        }
+    }
+    else // the entire line
+    {
+        rect.x = 0;
+        rect.width = GetClientSize().x;
+    }
+

     rect.y = i->GetY() - startY*PIXELS_PER_UNIT;
     rect.y = i->GetY() - startY*PIXELS_PER_UNIT;

-    rect.width = i->GetWidth();
-    //rect.height = i->GetHeight();

     rect.height = GetLineHeight(i);
 
     rect.height = GetLineHeight(i);
 

-    return TRUE;
+    return true;

 }
 
 }
 

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

 {
 {

-    wxCHECK_RET( item.IsOk(), _T("can't edit an invalid item") );
+    wxCHECK_MSG( item.IsOk(), NULL, _T("can't edit an invalid item") );

 
     wxGenericTreeItem *itemEdit = (wxGenericTreeItem *)item.m_pItem;
 
 
     wxGenericTreeItem *itemEdit = (wxGenericTreeItem *)item.m_pItem;
 


@@ -2859,7 +2928,7 @@ void wxGenericTreeCtrl::Edit( const wxTreeItemId& item )
     if ( GetEventHandler()->ProcessEvent( te ) && !te.IsAllowed() )
     {
         // vetoed by user
     if ( GetEventHandler()->ProcessEvent( te ) && !te.IsAllowed() )
     {
         // vetoed by user

-        return;
+        return NULL;

     }
 
     // We have to call this here because the label in
     }
 
     // We have to call this here because the label in


@@ -2872,9 +2941,12 @@ void wxGenericTreeCtrl::Edit( const wxTreeItemId& item )
         wxYieldIfNeeded();
 #endif
 
         wxYieldIfNeeded();
 #endif
 

+    // TODO: use textCtrlClass here to create the control of correct class

     m_textCtrl = new wxTreeTextCtrl(this, itemEdit);
 
     m_textCtrl->SetFocus();
     m_textCtrl = new wxTreeTextCtrl(this, itemEdit);
 
     m_textCtrl->SetFocus();

+
+    return m_textCtrl;

 }
 
 // returns a pointer to the text edit control if the item is being
 }
 
 // returns a pointer to the text edit control if the item is being


@@ -2885,6 +2957,14 @@ wxTextCtrl* wxGenericTreeCtrl::GetEditControl() const
     return m_textCtrl;
 }
 
     return m_textCtrl;
 }
 

+void wxGenericTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item),
+                                     bool discardChanges)
+{
+    wxCHECK_RET( m_textCtrl, _T("not editing label") );
+
+    m_textCtrl->EndEdit(discardChanges);
+}
+

 bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,
                                        const wxString& value)
 {
 bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,
                                        const wxString& value)
 {


@@ -2892,7 +2972,7 @@ bool wxGenericTreeCtrl::OnRenameAccept(wxGenericTreeItem *item,
     le.m_item = item;
     le.SetEventObject( this );
     le.m_label = value;
     le.m_item = item;
     le.SetEventObject( this );
     le.m_label = value;

-    le.m_editCancelled = FALSE;
+    le.m_editCancelled = false;

 
     return !GetEventHandler()->ProcessEvent( le ) || le.IsAllowed();
 }
 
     return !GetEventHandler()->ProcessEvent( le ) || le.IsAllowed();
 }


@@ -2904,17 +2984,14 @@ void wxGenericTreeCtrl::OnRenameCancelled(wxGenericTreeItem *item)
     le.m_item = item;
     le.SetEventObject( this );
     le.m_label = wxEmptyString;
     le.m_item = item;
     le.SetEventObject( this );
     le.m_label = wxEmptyString;

-    le.m_editCancelled = TRUE;
+    le.m_editCancelled = true;

 
     GetEventHandler()->ProcessEvent( le );
 }
 
 
     GetEventHandler()->ProcessEvent( le );
 }
 

-
-
-

 void wxGenericTreeCtrl::OnRenameTimer()
 {
 void wxGenericTreeCtrl::OnRenameTimer()
 {

-    Edit( m_current );
+    EditLabel( m_current );

 }
 
 void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 }
 
 void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )


@@ -2922,7 +2999,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
     if ( !m_anchor ) return;
 
     wxPoint pt = CalcUnscrolledPosition(event.GetPosition());
     if ( !m_anchor ) return;
 
     wxPoint pt = CalcUnscrolledPosition(event.GetPosition());

-    
+

     // Is the mouse over a tree item button?
     int flags = 0;
     wxGenericTreeItem *thisItem = m_anchor->HitTest(pt, this, flags, 0);
     // Is the mouse over a tree item button?
     int flags = 0;
     wxGenericTreeItem *thisItem = m_anchor->HitTest(pt, this, flags, 0);


@@ -2934,7 +3011,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
     if ((underMouse) &&
         (flags & wxTREE_HITTEST_ONITEMBUTTON) &&
         (!event.LeftIsDown()) &&
     if ((underMouse) &&
         (flags & wxTREE_HITTEST_ONITEMBUTTON) &&
         (!event.LeftIsDown()) &&

-        (!m_isDragging) && 
+        (!m_isDragging) &&

         (!m_renameTimer || !m_renameTimer->IsRunning()))
     {
     }
         (!m_renameTimer || !m_renameTimer->IsRunning()))
     {
     }


@@ -2942,7 +3019,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
     {
         underMouse = NULL;
     }
     {
         underMouse = NULL;
     }

-    
+

     if (underMouse != m_underMouse)
     {
          if (m_underMouse)
     if (underMouse != m_underMouse)
     {
          if (m_underMouse)


@@ -2952,7 +3029,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
             m_underMouse = NULL;
             RefreshLine( tmp );
          }
             m_underMouse = NULL;
             RefreshLine( tmp );
          }

-         
+

          m_underMouse = underMouse;
          if (m_underMouse)
             RefreshLine( m_underMouse );
          m_underMouse = underMouse;
          if (m_underMouse)
             RefreshLine( m_underMouse );


@@ -2976,7 +3053,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
         }
     }
 #endif
         }
     }
 #endif

-    
+

     // we process left mouse up event (enables in-place edit), right down
     // (pass to the user code), left dbl click (activate item) and
     // dragging/moving events for items drag-and-drop
     // we process left mouse up event (enables in-place edit), right down
     // (pass to the user code), left dbl click (activate item) and
     // dragging/moving events for items drag-and-drop


@@ -3016,6 +3093,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
         wxTreeEvent nevent( command, GetId() );
         nevent.m_item = m_current;
         nevent.SetEventObject(this);
         wxTreeEvent nevent( command, GetId() );
         nevent.m_item = m_current;
         nevent.SetEventObject(this);

+        nevent.SetPoint(CalcScrolledPosition(pt));

 
         // by default the dragging is not supported, the user code must
         // explicitly allow the event for it to take place
 
         // by default the dragging is not supported, the user code must
         // explicitly allow the event for it to take place


@@ -3024,7 +3102,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
         if ( GetEventHandler()->ProcessEvent(nevent) && nevent.IsAllowed() )
         {
             // we're going to drag this item
         if ( GetEventHandler()->ProcessEvent(nevent) && nevent.IsAllowed() )
         {
             // we're going to drag this item

-            m_isDragging = TRUE;
+            m_isDragging = true;

 
             // remember the old cursor because we will change it while
             // dragging
 
             // remember the old cursor because we will change it while
             // dragging


@@ -3037,7 +3115,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 
                 if ( m_oldSelection )
                 {
 
                 if ( m_oldSelection )
                 {

-                    m_oldSelection->SetHilight(FALSE);
+                    m_oldSelection->SetHilight(false);

                     RefreshLine(m_oldSelection);
                 }
             }
                     RefreshLine(m_oldSelection);
                 }
             }


@@ -3045,7 +3123,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
             CaptureMouse();
         }
     }
             CaptureMouse();
         }
     }

-    else if ( event.Moving() )
+    else if ( event.Dragging() )

     {
         if ( item != m_dropTarget )
         {
     {
         if ( item != m_dropTarget )
         {


@@ -3057,7 +3135,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
             // highlight the current drop target if any
             DrawDropEffect(m_dropTarget);
 
             // highlight the current drop target if any
             DrawDropEffect(m_dropTarget);
 

-#if defined( __WXMSW__ ) || defined(__WXMAC__)
+#if defined(__WXMSW__) || defined(__WXMAC__) || defined(__WXGTK20__)

             Update();
 #else
             wxYieldIfNeeded();
             Update();
 #else
             wxYieldIfNeeded();


@@ -3071,21 +3149,21 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 
         if ( m_oldSelection )
         {
 
         if ( m_oldSelection )
         {

-            m_oldSelection->SetHilight(TRUE);
+            m_oldSelection->SetHilight(true);

             RefreshLine(m_oldSelection);
             m_oldSelection = (wxGenericTreeItem *)NULL;
         }
 
         // generate the drag end event
             RefreshLine(m_oldSelection);
             m_oldSelection = (wxGenericTreeItem *)NULL;
         }
 
         // generate the drag end event

-        wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, GetId());
+        wxTreeEvent eventEndDrag(wxEVT_COMMAND_TREE_END_DRAG, GetId());

 
 

-        event.m_item = item;
-        event.m_pointDrag = pt;
-        event.SetEventObject(this);
+        eventEndDrag.m_item = item;
+        eventEndDrag.m_pointDrag = CalcScrolledPosition(pt);
+        eventEndDrag.SetEventObject(this);

 
 

-        (void)GetEventHandler()->ProcessEvent(event);
+        (void)GetEventHandler()->ProcessEvent(eventEndDrag);

 
 

-        m_isDragging = FALSE;
+        m_isDragging = false;

         m_dropTarget = (wxGenericTreeItem *)NULL;
 
         ReleaseMouse();
         m_dropTarget = (wxGenericTreeItem *)NULL;
 
         ReleaseMouse();


@@ -3100,6 +3178,16 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
     }
     else
     {
     }
     else
     {

+        // If we got to this point, we are not dragging or moving the mouse.
+        // Because the code in carbon/toplevel.cpp will only set focus to the tree
+        // if we skip for EVT_LEFT_DOWN, we MUST skip this event here for focus to work.
+        // We skip even if we didn't hit an item because we still should
+        // restore focus to the tree control even if we didn't exactly hit an item.
+        if ( event.LeftDown() )
+        {
+            event.Skip();
+        }
+

         // here we process only the messages which happen on tree items
 
         m_dragCount = 0;
         // here we process only the messages which happen on tree items
 
         m_dragCount = 0;


@@ -3108,23 +3196,38 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 
         if ( event.RightDown() )
         {
 
         if ( event.RightDown() )
         {

+            // If the item is already selected, do not update the selection.
+            // Multi-selections should not be cleared if a selected item is clicked.
+            if (!IsSelected(item))
+            {
+                DoSelectItem(item, true, false);
+            }
+

             wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, GetId());
             nevent.m_item = item;
             nevent.m_pointDrag = CalcScrolledPosition(pt);
             nevent.SetEventObject(this);
             wxTreeEvent nevent(wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK, GetId());
             nevent.m_item = item;
             nevent.m_pointDrag = CalcScrolledPosition(pt);
             nevent.SetEventObject(this);

-            GetEventHandler()->ProcessEvent(nevent);
+            event.Skip(!GetEventHandler()->ProcessEvent(nevent));
+
+            // Consistent with MSW (for now), send the ITEM_MENU *after*
+            // the RIGHT_CLICK event. TODO: This behavior may change.
+            wxTreeEvent nevent2(wxEVT_COMMAND_TREE_ITEM_MENU, GetId());
+            nevent2.m_item = item;
+            nevent2.m_pointDrag = CalcScrolledPosition(pt);
+            nevent2.SetEventObject(this);
+            GetEventHandler()->ProcessEvent(nevent2);

         }
         else if ( event.LeftUp() )
         {
             // this facilitates multiple-item drag-and-drop
 
         }
         else if ( event.LeftUp() )
         {
             // this facilitates multiple-item drag-and-drop
 

-            if (item && HasFlag(wxTR_MULTIPLE))
+            if ( /* item && */ HasFlag(wxTR_MULTIPLE))

             {
                 wxArrayTreeItemIds selections;
                 size_t count = GetSelections(selections);
 
                 if (count > 1 &&
             {
                 wxArrayTreeItemIds selections;
                 size_t count = GetSelections(selections);
 
                 if (count > 1 &&

-                    !event.ControlDown() &&
+                    !event.CmdDown() &&

                     !event.ShiftDown())
                 {
                     DoSelectItem(item, true, false);
                     !event.ShiftDown())
                 {
                     DoSelectItem(item, true, false);


@@ -3147,10 +3250,10 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
                         m_renameTimer = new wxTreeRenameTimer( this );
                     }
 
                         m_renameTimer = new wxTreeRenameTimer( this );
                     }
 

-                    m_renameTimer->Start( wxTreeRenameTimer::DELAY, TRUE );
+                    m_renameTimer->Start( wxTreeRenameTimer::DELAY, true );

                 }
 
                 }
 

-                m_lastOnSame = FALSE;
+                m_lastOnSame = false;

             }
         }
         else // !RightDown() && !LeftUp() ==> LeftDown() || LeftDClick()
             }
         }
         else // !RightDown() && !LeftUp() ==> LeftDown() || LeftDClick()


@@ -3178,14 +3281,14 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
             // user clicked outside of the present selection.
             // otherwise, perform the deselection on mouse-up.
             // this allows multiple drag and drop to work.
             // user clicked outside of the present selection.
             // otherwise, perform the deselection on mouse-up.
             // this allows multiple drag and drop to work.

-
-            if (!IsSelected(item))
+            // but if Cmd is down, toggle selection of the clicked item
+            if (!IsSelected(item) || event.CmdDown())

             {
                 // how should the selection work for this event?
                 bool is_multiple, extended_select, unselect_others;
                 EventFlagsToSelType(GetWindowStyleFlag(),
                                     event.ShiftDown(),
             {
                 // how should the selection work for this event?
                 bool is_multiple, extended_select, unselect_others;
                 EventFlagsToSelType(GetWindowStyleFlag(),
                                     event.ShiftDown(),

-                                    event.ControlDown(),
+                                    event.CmdDown(),

                                     is_multiple, extended_select, unselect_others);
 
                 DoSelectItem(item, unselect_others, extended_select);
                                     is_multiple, extended_select, unselect_others);
 
                 DoSelectItem(item, unselect_others, extended_select);


@@ -3200,7 +3303,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
                 if ( m_renameTimer )
                     m_renameTimer->Stop();
 
                 if ( m_renameTimer )
                     m_renameTimer->Stop();
 

-                m_lastOnSame = FALSE;
+                m_lastOnSame = false;

 
                 // send activate event first
                 wxTreeEvent nevent( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );
 
                 // send activate event first
                 wxTreeEvent nevent( wxEVT_COMMAND_TREE_ITEM_ACTIVATED, GetId() );


@@ -3225,7 +3328,7 @@ void wxGenericTreeCtrl::OnMouse( wxMouseEvent &event )
 void wxGenericTreeCtrl::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();
 void wxGenericTreeCtrl::OnInternalIdle()
 {
     wxWindow::OnInternalIdle();

-    
+

     // Check if we need to select the root item
     // because nothing else has been selected.
     // Delaying it means that we can invoke event handlers
     // Check if we need to select the root item
     // because nothing else has been selected.
     // Delaying it means that we can invoke event handlers


@@ -3243,8 +3346,8 @@ void wxGenericTreeCtrl::OnInternalIdle()
 
     if (!m_dirty) return;
     if (m_freezeCount) return;
 
     if (!m_dirty) return;
     if (m_freezeCount) return;

-    
-    m_dirty = FALSE;
+
+    m_dirty = false;

 
     CalculatePositions();
     Refresh();
 
     CalculatePositions();
     Refresh();


@@ -3278,7 +3381,7 @@ void wxGenericTreeCtrl::CalculateSize( wxGenericTreeItem *item, wxDC &dc )
         if ( m_imageListNormal )
         {
             m_imageListNormal->GetSize( image, image_w, image_h );
         if ( m_imageListNormal )
         {
             m_imageListNormal->GetSize( image, image_w, image_h );

-            image_w += 4;
+            image_w += MARGIN_BETWEEN_IMAGE_AND_TEXT;

         }
     }
 
         }
     }
 


@@ -3363,7 +3466,7 @@ void wxGenericTreeCtrl::RefreshSubtree(wxGenericTreeItem *item)
     rect.width = client.x;
     rect.height = client.y;
 
     rect.width = client.x;
     rect.height = client.y;
 

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

 
     AdjustMyScrollbars();
 }
 
     AdjustMyScrollbars();
 }


@@ -3378,13 +3481,13 @@ void wxGenericTreeCtrl::RefreshLine( wxGenericTreeItem *item )
     rect.width = GetClientSize().x;
     rect.height = GetLineHeight(item); //dc.GetCharHeight() + 6;
 
     rect.width = GetClientSize().x;
     rect.height = GetLineHeight(item); //dc.GetCharHeight() + 6;
 

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

 }
 
 void wxGenericTreeCtrl::RefreshSelected()
 {
     if (m_freezeCount) return;
 }
 
 void wxGenericTreeCtrl::RefreshSelected()
 {
     if (m_freezeCount) return;

-    
+

     // TODO: this is awfully inefficient, we should keep the list of all
     //       selected items internally, should be much faster
     if ( m_anchor )
     // TODO: this is awfully inefficient, we should keep the list of all
     //       selected items internally, should be much faster
     if ( m_anchor )


@@ -3394,7 +3497,7 @@ void wxGenericTreeCtrl::RefreshSelected()
 void wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem *item)
 {
     if (m_freezeCount) return;
 void wxGenericTreeCtrl::RefreshSelectedUnder(wxGenericTreeItem *item)
 {
     if (m_freezeCount) return;

-    
+

     if ( item->IsSelected() )
         RefreshLine(item);
 
     if ( item->IsSelected() )
         RefreshLine(item);
 


@@ -3414,7 +3517,7 @@ void wxGenericTreeCtrl::Freeze()
 void wxGenericTreeCtrl::Thaw()
 {
     wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen tree control?") );
 void wxGenericTreeCtrl::Thaw()
 {
     wxCHECK_RET( m_freezeCount > 0, _T("thawing unfrozen tree control?") );

-    
+

     if ( !--m_freezeCount )
     {
         Refresh();
     if ( !--m_freezeCount )
     {
         Refresh();


@@ -3428,25 +3531,25 @@ void wxGenericTreeCtrl::Thaw()
 bool wxGenericTreeCtrl::SetBackgroundColour(const wxColour& colour)
 {
     if ( !wxWindow::SetBackgroundColour(colour) )
 bool wxGenericTreeCtrl::SetBackgroundColour(const wxColour& colour)
 {
     if ( !wxWindow::SetBackgroundColour(colour) )

-        return FALSE;
+        return false;
+
+    if (m_freezeCount) return true;

 
 

-    if (m_freezeCount) return TRUE;
-    

     Refresh();
 
     Refresh();
 

-    return TRUE;
+    return true;

 }
 
 bool wxGenericTreeCtrl::SetForegroundColour(const wxColour& colour)
 {
     if ( !wxWindow::SetForegroundColour(colour) )
 }
 
 bool wxGenericTreeCtrl::SetForegroundColour(const wxColour& colour)
 {
     if ( !wxWindow::SetForegroundColour(colour) )

-        return FALSE;
+        return false;
+
+    if (m_freezeCount) return true;

 
 

-    if (m_freezeCount) return TRUE;
-    

     Refresh();
 
     Refresh();
 

-    return TRUE;
+    return true;

 }
 
 // Process the tooltip event, to speed up event processing.
 }
 
 // Process the tooltip event, to speed up event processing.


@@ -3485,4 +3588,18 @@ wxGenericTreeCtrl::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 #endif
 }
 
 #endif
 }
 

+#if WXWIN_COMPATIBILITY_2_4
+
+int wxGenericTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
+{
+    return GetItemImage(item, wxTreeItemIcon_Selected);
+}
+
+void wxGenericTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
+{
+    SetItemImage(item, image, wxTreeItemIcon_Selected);
+}
+
+#endif // WXWIN_COMPATIBILITY_2_4
+

 #endif // wxUSE_TREECTRL
 #endif // wxUSE_TREECTRL