another custom draw fix: leave space for the image even if the current item doesn...

[wxWidgets.git] / src / msw / treectrl.cpp
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp

index baaccbd974ce9e73f2664c9dca87469756690672..1a0cf91a8837453752022aed081e4d0233ca5540 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -17,10 +17,6 @@
  // headers
  // ----------------------------------------------------------------------------
  
  // headers
  // ----------------------------------------------------------------------------
  
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "treectrl.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"
  
@@ -32,6 +28,11 @@
  
  #include "wx/msw/private.h"
  
  
  #include "wx/msw/private.h"
  
+// include <commctrl.h> "properly"
+#include "wx/msw/wrapcctl.h"
+
+#include "wx/msw/missing.h"
+
  // Set this to 1 to be _absolutely_ sure that repainting will work for all
  // comctl32.dll versions
  #define wxUSE_COMCTL32_SAFELY 0
  // Set this to 1 to be _absolutely_ sure that repainting will work for all
  // comctl32.dll versions
  #define wxUSE_COMCTL32_SAFELY 0
@@ -41,20 +42,14 @@
  #include "wx/dynarray.h"
  #include "wx/imaglist.h"
  #include "wx/settings.h"
  #include "wx/dynarray.h"
  #include "wx/imaglist.h"
  #include "wx/settings.h"
-#include "wx/msw/treectrl.h"
+#include "wx/treectrl.h"
  #include "wx/msw/dragimag.h"
  
  #include "wx/msw/dragimag.h"
  
-// include <commctrl.h> "properly"
-#include "wx/msw/wrapcctl.h"
-
  // macros to hide the cast ugliness
  // --------------------------------
  
  // macros to hide the cast ugliness
  // --------------------------------
  
-// ptr is the real item id, i.e. wxTreeItemId::m_pItem
-#define HITEM_PTR(ptr)     (HTREEITEM)(ptr)
-
-// item here is a wxTreeItemId
-#define HITEM(item)     HITEM_PTR((item).m_pItem)
+// get HTREEITEM from wxTreeItemId
+#define HITEM(item)     ((HTREEITEM)(((item).m_pItem)))
  
  // the native control doesn't support multiple selections under MSW and we
  // have 2 ways to emulate them: either using TVS_CHECKBOXES style and let
  
  // the native control doesn't support multiple selections under MSW and we
  // have 2 ways to emulate them: either using TVS_CHECKBOXES style and let
@@ -97,7 +92,7 @@ static bool IsItemSelected(HWND hwndTV, HTREEITEM hItem)
      return (tvi.state & TVIS_SELECTED) != 0;
  }
  
      return (tvi.state & TVIS_SELECTED) != 0;
  }
  
-static void SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = true)
+static bool SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = true)
  {
      TV_ITEM tvi;
      tvi.mask = TVIF_STATE | TVIF_HANDLE;
  {
      TV_ITEM tvi;
      tvi.mask = TVIF_STATE | TVIF_HANDLE;
@@ -108,7 +103,10 @@ static void SelectItem(HWND hwndTV, HTREEITEM hItem, bool select = true)
      if ( TreeView_SetItem(hwndTV, &tvi) == -1 )
      {
          wxLogLastError(wxT("TreeView_SetItem"));
      if ( TreeView_SetItem(hwndTV, &tvi) == -1 )
      {
          wxLogLastError(wxT("TreeView_SetItem"));
+        return false;
      }
      }
+
+    return true;
  }
  
  static inline void UnselectItem(HWND hwndTV, HTREEITEM htItem)
  }
  
  static inline void UnselectItem(HWND hwndTV, HTREEITEM htItem)
@@ -313,6 +311,11 @@ public:
          m_tree = tree;
      }
  
          m_tree = tree;
      }
  
+    // give it a virtual dtor: not really needed as the class is never used
+    // polymorphically and not even allocated on heap at all, but this is safer
+    // (in case it ever is) and silences the compiler warnings for now
+    virtual ~wxTreeTraversal() { }
+
      // do traverse the tree: visit all items (recursively by default) under the
      // given one; return true if all items were traversed or false if the
      // traversal was aborted because OnVisit returned false
      // do traverse the tree: visit all items (recursively by default) under the
      // given one; return true if all items were traversed or false if the
      // traversal was aborted because OnVisit returned false
@@ -343,7 +346,8 @@ public:
          {
              m_selections.Empty();
  
          {
              m_selections.Empty();
  
-            DoTraverse(tree->GetRootItem());
+            if (tree->GetCount() > 0)
+                DoTraverse(tree->GetRootItem());
          }
  
      virtual bool OnVisit(const wxTreeItemId& item)
          }
  
      virtual bool OnVisit(const wxTreeItemId& item)
@@ -482,7 +486,7 @@ wxBEGIN_FLAGS( wxTreeCtrlStyle )
      wxFLAGS_MEMBER(wxBORDER_RAISED)
      wxFLAGS_MEMBER(wxBORDER_STATIC)
      wxFLAGS_MEMBER(wxBORDER_NONE)
      wxFLAGS_MEMBER(wxBORDER_RAISED)
      wxFLAGS_MEMBER(wxBORDER_STATIC)
      wxFLAGS_MEMBER(wxBORDER_NONE)
-    
+
      // old style border flags
      wxFLAGS_MEMBER(wxSIMPLE_BORDER)
      wxFLAGS_MEMBER(wxSUNKEN_BORDER)
      // old style border flags
      wxFLAGS_MEMBER(wxSIMPLE_BORDER)
      wxFLAGS_MEMBER(wxSUNKEN_BORDER)
@@ -521,15 +525,15 @@ wxEND_FLAGS( wxTreeCtrlStyle )
  IMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl,"wx/treectrl.h")
  
  wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
  IMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl,"wx/treectrl.h")
  
  wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
-    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent ) 
+    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
      wxEVENT_RANGE_PROPERTY( TreeEvent , wxEVT_COMMAND_TREE_BEGIN_DRAG , wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK , wxTreeEvent )
      wxEVENT_RANGE_PROPERTY( TreeEvent , wxEVT_COMMAND_TREE_BEGIN_DRAG , wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK , wxTreeEvent )
-    wxPROPERTY_FLAGS( WindowStyle , wxTreeCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
+    wxPROPERTY_FLAGS( WindowStyle , wxTreeCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
  wxEND_PROPERTIES_TABLE()
  
  wxBEGIN_HANDLERS_TABLE(wxTreeCtrl)
  wxEND_HANDLERS_TABLE()
  
  wxEND_PROPERTIES_TABLE()
  
  wxBEGIN_HANDLERS_TABLE(wxTreeCtrl)
  wxEND_HANDLERS_TABLE()
  
-wxCONSTRUCTOR_5( wxTreeCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle ) 
+wxCONSTRUCTOR_5( wxTreeCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
  #else
  IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
  #endif
  #else
  IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
  #endif
@@ -607,9 +611,6 @@ bool wxTreeTraversal::Traverse(const wxTreeItemId& root, bool recursively)
  
  void wxTreeCtrl::Init()
  {
  
  void wxTreeCtrl::Init()
  {
-    m_imageListNormal = NULL;
-    m_imageListState = NULL;
-    m_ownsImageListNormal = m_ownsImageListState = false;
      m_textCtrl = NULL;
      m_hasAnyAttr = false;
      m_dragImage = NULL;
      m_textCtrl = NULL;
      m_hasAnyAttr = false;
      m_dragImage = NULL;
@@ -656,7 +657,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
  
      if ( m_windowStyle & wxTR_FULL_ROW_HIGHLIGHT )
      {
  
      if ( m_windowStyle & wxTR_FULL_ROW_HIGHLIGHT )
      {
-        if ( wxTheApp->GetComCtl32Version() >= 471 )
+        if ( wxApp::GetComCtl32Version() >= 471 )
              wstyle |= TVS_FULLROWSELECT;
      }
  
              wstyle |= TVS_FULLROWSELECT;
      }
  
@@ -674,8 +675,13 @@ bool wxTreeCtrl::Create(wxWindow *parent,
          wstyle |= TVS_CHECKBOXES;
  #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
  
          wstyle |= TVS_CHECKBOXES;
  #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
  
+#if !defined(__WXWINCE__) && defined(TVS_INFOTIP)
+    // Need so that TVN_GETINFOTIP messages will be sent
+    wstyle |= TVS_INFOTIP;
+#endif
+
      // Create the tree control.
      // Create the tree control.
-    if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )
+    if ( !MSWCreateControl(WC_TREEVIEW, wstyle, pos, size) )
          return false;
  
  #if wxUSE_COMCTL32_SAFELY
          return false;
  
  #if wxUSE_COMCTL32_SAFELY
@@ -708,8 +714,8 @@ bool wxTreeCtrl::Create(wxWindow *parent,
          HDC hdcMem = CreateCompatibleDC(NULL);
  
          // create a mono bitmap of the standard size
          HDC hdcMem = CreateCompatibleDC(NULL);
  
          // create a mono bitmap of the standard size
-        int x = GetSystemMetrics(SM_CXMENUCHECK);
-        int y = GetSystemMetrics(SM_CYMENUCHECK);
+        int x = ::GetSystemMetrics(SM_CXMENUCHECK);
+        int y = ::GetSystemMetrics(SM_CYMENUCHECK);
          wxImageList imagelistCheckboxes(x, y, false, 2);
          HBITMAP hbmpCheck = CreateBitmap(x, y,   // bitmap size
                                           1,      // # of color planes
          wxImageList imagelistCheckboxes(x, y, false, 2);
          HBITMAP hbmpCheck = CreateBitmap(x, y,   // bitmap size
                                           1,      // # of color planes
@@ -747,7 +753,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
      }
  #endif // 0
  
      }
  #endif // 0
  
-    SetSize(pos.x, pos.y, size.x, size.y);
+    wxSetCCUnicodeFormat(GetHwnd());
  
      return true;
  }
  
      return true;
  }
@@ -768,15 +774,24 @@ wxTreeCtrl::~wxTreeCtrl()
      // delete user data to prevent memory leaks
      // also deletes hidden root node storage.
      DeleteAllItems();
      // delete user data to prevent memory leaks
      // also deletes hidden root node storage.
      DeleteAllItems();
-
-    if (m_ownsImageListNormal) delete m_imageListNormal;
-    if (m_ownsImageListState) delete m_imageListState;
  }
  
  // ----------------------------------------------------------------------------
  // accessors
  // ----------------------------------------------------------------------------
  
  }
  
  // ----------------------------------------------------------------------------
  // accessors
  // ----------------------------------------------------------------------------
  
+/* static */ wxVisualAttributes
+wxTreeCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
+{
+    wxVisualAttributes attrs = GetCompositeControlsDefaultAttributes(variant);
+
+    // common controls have their own default font
+    attrs.font = wxGetCCDefaultFont();
+
+    return attrs;
+}
+
+
  // simple wrappers which add error checking in debug mode
  
  bool wxTreeCtrl::DoGetItem(wxTreeViewItem* tvItem) const
  // simple wrappers which add error checking in debug mode
  
  bool wxTreeCtrl::DoGetItem(wxTreeViewItem* tvItem) const
@@ -817,22 +832,12 @@ void wxTreeCtrl::SetIndent(unsigned int indent)
      TreeView_SetIndent(GetHwnd(), indent);
  }
  
      TreeView_SetIndent(GetHwnd(), indent);
  }
  
-wxImageList *wxTreeCtrl::GetImageList() const
-{
-    return m_imageListNormal;
-}
-
-wxImageList *wxTreeCtrl::GetStateImageList() const
-{
-    return m_imageListState;
-}
-
  void wxTreeCtrl::SetAnyImageList(wxImageList *imageList, int which)
  {
      // no error return
  void wxTreeCtrl::SetAnyImageList(wxImageList *imageList, int which)
  {
      // no error return
-    TreeView_SetImageList(GetHwnd(),
-                          imageList ? imageList->GetHIMAGELIST() : 0,
-                          which);
+    (void) TreeView_SetImageList(GetHwnd(),
+                                 imageList ? imageList->GetHIMAGELIST() : 0,
+                                 which);
  }
  
  void wxTreeCtrl::SetImageList(wxImageList *imageList)
  }
  
  void wxTreeCtrl::SetImageList(wxImageList *imageList)
@@ -851,23 +856,12 @@ void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
      m_ownsImageListState = false;
  }
  
      m_ownsImageListState = false;
  }
  
-void wxTreeCtrl::AssignImageList(wxImageList *imageList)
-{
-    SetImageList(imageList);
-    m_ownsImageListNormal = true;
-}
-
-void wxTreeCtrl::AssignStateImageList(wxImageList *imageList)
-{
-    SetStateImageList(imageList);
-    m_ownsImageListState = true;
-}
-
  size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
                                      bool recursively) const
  {
  size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
                                      bool recursively) const
  {
-    TraverseCounter counter(this, item, recursively);
+    wxCHECK_MSG( item.IsOk(), 0u, wxT("invalid tree item") );
  
  
+    TraverseCounter counter(this, item, recursively);
      return counter.GetCount() - 1;
  }
  
      return counter.GetCount() - 1;
  }
  
@@ -881,7 +875,7 @@ bool wxTreeCtrl::SetBackgroundColour(const wxColour &colour)
      if ( !wxWindowBase::SetBackgroundColour(colour) )
          return false;
  
      if ( !wxWindowBase::SetBackgroundColour(colour) )
          return false;
  
-    SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel());
+    ::SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel());
  #endif
  
      return true;
  #endif
  
      return true;
@@ -893,7 +887,7 @@ bool wxTreeCtrl::SetForegroundColour(const wxColour &colour)
      if ( !wxWindowBase::SetForegroundColour(colour) )
          return false;
  
      if ( !wxWindowBase::SetForegroundColour(colour) )
          return false;
  
-    SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel());
+    ::SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel());
  #endif
  
      return true;
  #endif
  
      return true;
@@ -905,6 +899,8 @@ bool wxTreeCtrl::SetForegroundColour(const wxColour &colour)
  
  wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
  {
  
  wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), wxEmptyString, wxT("invalid tree item") );
+
      wxChar buf[512];  // the size is arbitrary...
  
      wxTreeViewItem tvItem(item, TVIF_TEXT);
      wxChar buf[512];  // the size is arbitrary...
  
      wxTreeViewItem tvItem(item, TVIF_TEXT);
@@ -921,6 +917,8 @@ wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
  
  void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
  {
  
  void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
  {
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
      if ( IS_VIRTUAL_ROOT(item) )
          return;
  
      if ( IS_VIRTUAL_ROOT(item) )
          return;
  
@@ -936,7 +934,7 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
      HWND hwndEdit = TreeView_GetEditControl(GetHwnd());
      if ( hwndEdit )
      {
      HWND hwndEdit = TreeView_GetEditControl(GetHwnd());
      if ( hwndEdit )
      {
-        if ( item == GetSelection() )
+        if ( item == m_idEdited )
          {
              ::SetWindowText(hwndEdit, text);
          }
          {
              ::SetWindowText(hwndEdit, text);
          }
@@ -996,6 +994,8 @@ void wxTreeCtrl::DoSetItemImages(const wxTreeItemId& item,
  int wxTreeCtrl::GetItemImage(const wxTreeItemId& item,
                               wxTreeItemIcon which) const
  {
  int wxTreeCtrl::GetItemImage(const wxTreeItemId& item,
                               wxTreeItemIcon which) const
  {
+    wxCHECK_MSG( item.IsOk(), -1, wxT("invalid tree item") );
+
      if ( (HITEM(item) == TVI_ROOT) && (m_windowStyle & wxTR_HIDE_ROOT) )
      {
          // TODO: Maybe a hidden root can still provide images?
      if ( (HITEM(item) == TVI_ROOT) && (m_windowStyle & wxTR_HIDE_ROOT) )
      {
          // TODO: Maybe a hidden root can still provide images?
@@ -1035,6 +1035,8 @@ int wxTreeCtrl::GetItemImage(const wxTreeItemId& item,
  void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image,
                                wxTreeItemIcon which)
  {
  void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image,
                                wxTreeItemIcon which)
  {
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
      if ( IS_VIRTUAL_ROOT(item) )
      {
          // TODO: Maybe a hidden root can still store images?
      if ( IS_VIRTUAL_ROOT(item) )
      {
          // TODO: Maybe a hidden root can still store images?
@@ -1107,6 +1109,8 @@ void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image,
  
  wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
  {
  
  wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), NULL, wxT("invalid tree item") );
+
      wxTreeViewItem tvItem(item, TVIF_PARAM);
  
      // Hidden root may have data.
      wxTreeViewItem tvItem(item, TVIF_PARAM);
  
      // Hidden root may have data.
@@ -1132,6 +1136,8 @@ wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
  
  void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
  {
  
  void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
  {
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
      if ( IS_VIRTUAL_ROOT(item) )
      {
          GET_VIRTUAL_ROOT()->SetData(data);
      if ( IS_VIRTUAL_ROOT(item) )
      {
          GET_VIRTUAL_ROOT()->SetData(data);
@@ -1191,6 +1197,8 @@ bool wxTreeCtrl::HasIndirectData(const wxTreeItemId& item) const
  
  void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
  {
  
  void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
  {
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
      if ( IS_VIRTUAL_ROOT(item) )
          return;
  
      if ( IS_VIRTUAL_ROOT(item) )
          return;
  
@@ -1201,6 +1209,8 @@ void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
  
  void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
  {
  
  void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
  {
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
      if ( IS_VIRTUAL_ROOT(item) )
          return;
  
      if ( IS_VIRTUAL_ROOT(item) )
          return;
  
@@ -1233,28 +1243,33 @@ void wxTreeCtrl::RefreshItem(const wxTreeItemId& item)
  
  wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
  {
  
  wxColour wxTreeCtrl::GetItemTextColour(const wxTreeItemId& item) const
  {
-    wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);
+    wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree item") );
  
  
+    wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);
      return it == m_attrs.end() ? wxNullColour : it->second->GetTextColour();
  }
  
  wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
  {
      return it == m_attrs.end() ? wxNullColour : it->second->GetTextColour();
  }
  
  wxColour wxTreeCtrl::GetItemBackgroundColour(const wxTreeItemId& item) const
  {
-    wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);
+    wxCHECK_MSG( item.IsOk(), wxNullColour, wxT("invalid tree item") );
  
  
+    wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);
      return it == m_attrs.end() ? wxNullColour : it->second->GetBackgroundColour();
  }
  
  wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const
  {
      return it == m_attrs.end() ? wxNullColour : it->second->GetBackgroundColour();
  }
  
  wxFont wxTreeCtrl::GetItemFont(const wxTreeItemId& item) const
  {
-    wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);
+    wxCHECK_MSG( item.IsOk(), wxNullFont, wxT("invalid tree item") );
  
  
+    wxMapTreeAttr::const_iterator it = m_attrs.find(item.m_pItem);
      return it == m_attrs.end() ? wxNullFont : it->second->GetFont();
  }
  
  void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
                                     const wxColour& col)
  {
      return it == m_attrs.end() ? wxNullFont : it->second->GetFont();
  }
  
  void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
                                     const wxColour& col)
  {
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
      wxTreeItemAttr *attr;
      wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);
      if ( it == m_attrs.end() )
      wxTreeItemAttr *attr;
      wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);
      if ( it == m_attrs.end() )
@@ -1277,6 +1292,8 @@ void wxTreeCtrl::SetItemTextColour(const wxTreeItemId& item,
  void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
                                           const wxColour& col)
  {
  void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
                                           const wxColour& col)
  {
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
      wxTreeItemAttr *attr;
      wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);
      if ( it == m_attrs.end() )
      wxTreeItemAttr *attr;
      wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);
      if ( it == m_attrs.end() )
@@ -1298,6 +1315,8 @@ void wxTreeCtrl::SetItemBackgroundColour(const wxTreeItemId& item,
  
  void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
  {
  
  void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
  {
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
      wxTreeItemAttr *attr;
      wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);
      if ( it == m_attrs.end() )
      wxTreeItemAttr *attr;
      wxMapTreeAttr::iterator it = m_attrs.find(item.m_pItem);
      if ( it == m_attrs.end() )
@@ -1323,6 +1342,8 @@ void wxTreeCtrl::SetItemFont(const wxTreeItemId& item, const wxFont& font)
  
  bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
  {
  
  bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+
      if ( item == wxTreeItemId(TVI_ROOT) )
      {
          // virtual (hidden) root is never visible
      if ( item == wxTreeItemId(TVI_ROOT) )
      {
          // virtual (hidden) root is never visible
@@ -1352,6 +1373,8 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
  
  bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
  {
  
  bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+
      wxTreeViewItem tvItem(item, TVIF_CHILDREN);
      DoGetItem(&tvItem);
  
      wxTreeViewItem tvItem(item, TVIF_CHILDREN);
      DoGetItem(&tvItem);
  
@@ -1360,8 +1383,7 @@ bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
  
  bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
  {
  
  bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
  {
-    // probably not a good idea to put it here
-    //wxASSERT( ItemHasChildren(item) );
+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
  
      wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_EXPANDED);
      DoGetItem(&tvItem);
  
      wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_EXPANDED);
      DoGetItem(&tvItem);
@@ -1371,6 +1393,8 @@ bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
  
  bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
  {
  
  bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+
      wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_SELECTED);
      DoGetItem(&tvItem);
  
      wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_SELECTED);
      DoGetItem(&tvItem);
  
@@ -1379,6 +1403,8 @@ bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
  
  bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
  {
  
  bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+
      wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_BOLD);
      DoGetItem(&tvItem);
  
      wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_BOLD);
      DoGetItem(&tvItem);
  
@@ -1408,6 +1434,8 @@ wxTreeItemId wxTreeCtrl::GetSelection() const
  
  wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const
  {
  
  wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+
      HTREEITEM hItem;
  
      if ( IS_VIRTUAL_ROOT(item) )
      HTREEITEM hItem;
  
      if ( IS_VIRTUAL_ROOT(item) )
@@ -1431,6 +1459,8 @@ wxTreeItemId wxTreeCtrl::GetItemParent(const wxTreeItemId& item) const
  wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
                                         wxTreeItemIdValue& cookie) const
  {
  wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
                                         wxTreeItemIdValue& cookie) const
  {
+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+
      // remember the last child returned in 'cookie'
      cookie = TreeView_GetChild(GetHwnd(), HITEM(item));
  
      // remember the last child returned in 'cookie'
      cookie = TreeView_GetChild(GetHwnd(), HITEM(item));
  
@@ -1440,8 +1470,14 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
  wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
                                        wxTreeItemIdValue& cookie) const
  {
  wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
                                        wxTreeItemIdValue& cookie) const
  {
-    wxTreeItemId item(TreeView_GetNextSibling(GetHwnd(),
-                                              HITEM(wxTreeItemId(cookie))));
+    wxTreeItemId fromCookie(cookie);
+
+    HTREEITEM hitem = HITEM(fromCookie);
+
+    hitem = TreeView_GetNextSibling(GetHwnd(), hitem);
+
+    wxTreeItemId item(hitem);
+
      cookie = item.m_pItem;
  
      return item;
      cookie = item.m_pItem;
  
      return item;
@@ -1452,6 +1488,8 @@ wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
  wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
                                         long& cookie) const
  {
  wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
                                         long& cookie) const
  {
+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+
      cookie = (long)TreeView_GetChild(GetHwnd(), HITEM(item));
  
      return wxTreeItemId((void *)cookie);
      cookie = (long)TreeView_GetChild(GetHwnd(), HITEM(item));
  
      return wxTreeItemId((void *)cookie);
@@ -1460,11 +1498,14 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
  wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
                                        long& cookie) const
  {
  wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
                                        long& cookie) const
  {
-    wxTreeItemId item(TreeView_GetNextSibling
-                      (
-                        GetHwnd(),
-                        HITEM(wxTreeItemId((void *)cookie)
-                      )));
+    wxTreeItemId fromCookie((void *)cookie);
+
+    HTREEITEM hitem = HITEM(fromCookie);
+
+    hitem = TreeView_GetNextSibling(GetHwnd(), hitem);
+
+    wxTreeItemId item(hitem);
+
      cookie = (long)item.m_pItem;
  
      return item;
      cookie = (long)item.m_pItem;
  
      return item;
@@ -1474,6 +1515,8 @@ wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
  
  wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
  {
  
  wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
+
      // can this be done more efficiently?
      wxTreeItemIdValue cookie;
  
      // can this be done more efficiently?
      wxTreeItemIdValue cookie;
  
@@ -1490,11 +1533,13 @@ wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
  
  wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
  {
  
  wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
      return wxTreeItemId(TreeView_GetNextSibling(GetHwnd(), HITEM(item)));
  }
  
  wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
  {
      return wxTreeItemId(TreeView_GetNextSibling(GetHwnd(), HITEM(item)));
  }
  
  wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
      return wxTreeItemId(TreeView_GetPrevSibling(GetHwnd(), HITEM(item)));
  }
  
      return wxTreeItemId(TreeView_GetPrevSibling(GetHwnd(), HITEM(item)));
  }
  
@@ -1505,6 +1550,7 @@ wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
  
  wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
  {
  
  wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
      wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() for must be visible itself!"));
  
      return wxTreeItemId(TreeView_GetNextVisible(GetHwnd(), HITEM(item)));
      wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() for must be visible itself!"));
  
      return wxTreeItemId(TreeView_GetNextVisible(GetHwnd(), HITEM(item)));
@@ -1512,6 +1558,7 @@ wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
  
  wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
  {
  
  wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), wxTreeItemId(), wxT("invalid tree item") );
      wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() for must be visible itself!"));
  
      return wxTreeItemId(TreeView_GetPrevVisible(GetHwnd(), HITEM(item)));
      wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() for must be visible itself!"));
  
      return wxTreeItemId(TreeView_GetPrevVisible(GetHwnd(), HITEM(item)));
@@ -1523,6 +1570,8 @@ wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
  
  bool wxTreeCtrl::IsItemChecked(const wxTreeItemId& item) const
  {
  
  bool wxTreeCtrl::IsItemChecked(const wxTreeItemId& item) const
  {
+    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
+
      // receive the desired information.
      wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
      DoGetItem(&tvItem);
      // receive the desired information.
      wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
      DoGetItem(&tvItem);
@@ -1533,6 +1582,8 @@ bool wxTreeCtrl::IsItemChecked(const wxTreeItemId& item) const
  
  void wxTreeCtrl::SetItemCheck(const wxTreeItemId& item, bool check)
  {
  
  void wxTreeCtrl::SetItemCheck(const wxTreeItemId& item, bool check)
  {
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
      // receive the desired information.
      wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
  
      // receive the desired information.
      wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
  
@@ -1555,11 +1606,11 @@ size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds& selections) const
  // Usual operations
  // ----------------------------------------------------------------------------
  
  // Usual operations
  // ----------------------------------------------------------------------------
  
-wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
-                                      wxTreeItemId hInsertAfter,
-                                      const wxString& text,
-                                      int image, int selectedImage,
-                                      wxTreeItemData *data)
+wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
+                                       const wxTreeItemId& hInsertAfter,
+                                       const wxString& text,
+                                       int image, int selectedImage,
+                                       wxTreeItemData *data)
  {
      wxCHECK_MSG( parent.IsOk() || !TreeView_GetRoot(GetHwnd()),
                   wxTreeItemId(),
  {
      wxCHECK_MSG( parent.IsOk() || !TreeView_GetRoot(GetHwnd()),
                   wxTreeItemId(),
@@ -1577,7 +1628,7 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
      }
  
      UINT mask = 0;
      }
  
      UINT mask = 0;
-    if ( !text.IsEmpty() )
+    if ( !text.empty() )
      {
          mask |= TVIF_TEXT;
          tvIns.item.pszText = (wxChar *)text.c_str();  // cast is ok
      {
          mask |= TVIF_TEXT;
          tvIns.item.pszText = (wxChar *)text.c_str();  // cast is ok
@@ -1632,13 +1683,19 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
  // for compatibility only
  #if WXWIN_COMPATIBILITY_2_4
  
  // for compatibility only
  #if WXWIN_COMPATIBILITY_2_4
  
-wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
-                                    const wxString& text,
-                                    int image, int selImage,
-                                    long insertAfter)
+void wxTreeCtrl::SetImageList(wxImageList *imageList, int)
+{
+    SetImageList(imageList);
+}
+
+int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
+{
+    return GetItemImage(item, wxTreeItemIcon_Selected);
+}
+
+void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
  {
  {
-    return DoInsertItem(parent, wxTreeItemId((void *)insertAfter), text,
-                        image, selImage, NULL);
+    SetItemImage(item, image, wxTreeItemIcon_Selected);
  }
  
  #endif // WXWIN_COMPATIBILITY_2_4
  }
  
  #endif // WXWIN_COMPATIBILITY_2_4
@@ -1656,59 +1713,40 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
          return TVI_ROOT;
      }
  
          return TVI_ROOT;
      }
  
-    return DoInsertItem(wxTreeItemId(), wxTreeItemId(),
-                        text, image, selectedImage, data);
+    return DoInsertAfter(wxTreeItemId(), wxTreeItemId(),
+                           text, image, selectedImage, data);
  }
  
  }
  
-wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent,
-                                     const wxString& text,
-                                     int image, int selectedImage,
-                                     wxTreeItemData *data)
-{
-    return DoInsertItem(parent, TVI_FIRST,
-                        text, image, selectedImage, data);
-}
-
-wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
-                                    const wxTreeItemId& idPrevious,
-                                    const wxString& text,
-                                    int image, int selectedImage,
-                                    wxTreeItemData *data)
-{
-    return DoInsertItem(parent, idPrevious, text, image, selectedImage, data);
-}
-
-wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
-                                    size_t index,
-                                    const wxString& text,
-                                    int image, int selectedImage,
-                                    wxTreeItemData *data)
+wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
+                                      size_t index,
+                                      const wxString& text,
+                                      int image, int selectedImage,
+                                      wxTreeItemData *data)
  {
  {
-    // find the item from index
-    wxTreeItemIdValue cookie;
-    wxTreeItemId idPrev, idCur = GetFirstChild(parent, cookie);
-    while ( index != 0 && idCur.IsOk() )
+    wxTreeItemId idPrev;
+    if ( index == (size_t)-1 )
      {
      {
-        index--;
-
-        idPrev = idCur;
-        idCur = GetNextChild(parent, cookie);
+        // special value: append to the end
+        idPrev = TVI_LAST;
      }
      }
+    else // find the item from index
+    {
+        wxTreeItemIdValue cookie;
+        wxTreeItemId idCur = GetFirstChild(parent, cookie);
+        while ( index != 0 && idCur.IsOk() )
+        {
+            index--;
  
  
-    // assert, not check: if the index is invalid, we will append the item
-    // to the end
-    wxASSERT_MSG( index == 0, _T("bad index in wxTreeCtrl::InsertItem") );
+            idPrev = idCur;
+            idCur = GetNextChild(parent, cookie);
+        }
  
  
-    return DoInsertItem(parent, idPrev, text, image, selectedImage, data);
-}
+        // assert, not check: if the index is invalid, we will append the item
+        // to the end
+        wxASSERT_MSG( index == 0, _T("bad index in wxTreeCtrl::InsertItem") );
+    }
  
  
-wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent,
-                                    const wxString& text,
-                                    int image, int selectedImage,
-                                    wxTreeItemData *data)
-{
-    return DoInsertItem(parent, TVI_LAST,
-                        text, image, selectedImage, data);
+    return DoInsertAfter(parent, idPrev, text, image, selectedImage, data);
  }
  
  void wxTreeCtrl::Delete(const wxTreeItemId& item)
  }
  
  void wxTreeCtrl::Delete(const wxTreeItemId& item)
@@ -1736,7 +1774,7 @@ void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
      size_t nCount = children.Count();
      for ( size_t n = 0; n < nCount; n++ )
      {
      size_t nCount = children.Count();
      for ( size_t n = 0; n < nCount; n++ )
      {
-        if ( !TreeView_DeleteItem(GetHwnd(), HITEM_PTR(children[n])) )
+        if ( !TreeView_DeleteItem(GetHwnd(), HITEM(children[n])) )
          {
              wxLogLastError(wxT("TreeView_DeleteItem"));
          }
          {
              wxLogLastError(wxT("TreeView_DeleteItem"));
          }
@@ -1822,10 +1860,12 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item)
  }
  
  #if WXWIN_COMPATIBILITY_2_4
  }
  
  #if WXWIN_COMPATIBILITY_2_4
+
  void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
  {
      DoExpand(item, action);
  }
  void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
  {
      DoExpand(item, action);
  }
+
  #endif
  
  void wxTreeCtrl::Unselect()
  #endif
  
  void wxTreeCtrl::Unselect()
@@ -1846,11 +1886,13 @@ void wxTreeCtrl::UnselectAll()
          for ( size_t n = 0; n < count; n++ )
          {
  #if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
          for ( size_t n = 0; n < count; n++ )
          {
  #if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
-            SetItemCheck(HITEM_PTR(selections[n]), false);
+            SetItemCheck(HITEM(selections[n]), false);
  #else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
  #else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
-            ::UnselectItem(GetHwnd(), HITEM_PTR(selections[n]));
+            ::UnselectItem(GetHwnd(), HITEM(selections[n]));
  #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
          }
  #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
          }
+
+        m_htSelStart.Unset();
      }
      else
      {
      }
      else
      {
@@ -1859,19 +1901,22 @@ void wxTreeCtrl::UnselectAll()
      }
  }
  
      }
  }
  
-void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
+void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
  {
      if ( m_windowStyle & wxTR_MULTIPLE )
      {
  #if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
          // selecting the item means checking it
  {
      if ( m_windowStyle & wxTR_MULTIPLE )
      {
  #if wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
          // selecting the item means checking it
-        SetItemCheck(item);
+        SetItemCheck(item, select);
  #else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
  #else // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
-        ::SelectItem(GetHwnd(), HITEM(item));
+        ::SelectItem(GetHwnd(), HITEM(item), select);
  #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
      }
      else
      {
  #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE/!wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
      }
      else
      {
+        wxASSERT_MSG( select,
+                      _T("SelectItem(false) works only for multiselect") );
+
          // inspite of the docs (MSDN Jan 99 edition), we don't seem to receive
          // the notification from the control (i.e. TVN_SELCHANG{ED|ING}), so
          // send them ourselves
          // inspite of the docs (MSDN Jan 99 edition), we don't seem to receive
          // the notification from the control (i.e. TVN_SELCHANG{ED|ING}), so
          // send them ourselves
@@ -1887,7 +1932,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
              {
                  wxLogLastError(wxT("TreeView_SelectItem"));
              }
              {
                  wxLogLastError(wxT("TreeView_SelectItem"));
              }
-            else
+            else // ok
              {
                  event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
                  (void)GetEventHandler()->ProcessEvent(event);
              {
                  event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
                  (void)GetEventHandler()->ProcessEvent(event);
@@ -1932,6 +1977,8 @@ void wxTreeCtrl::DeleteTextCtrl()
          m_textCtrl->SetHWND(0);
          delete m_textCtrl;
          m_textCtrl = NULL;
          m_textCtrl->SetHWND(0);
          delete m_textCtrl;
          m_textCtrl = NULL;
+
+        m_idEdited.Unset();
      }
  }
  
      }
  }
  
@@ -1942,6 +1989,7 @@ wxTextCtrl* wxTreeCtrl::EditLabel(const wxTreeItemId& item,
  
      DeleteTextCtrl();
  
  
      DeleteTextCtrl();
  
+    m_idEdited = item;
      m_textCtrl = (wxTextCtrl *)textControlClass->CreateObject();
      HWND hWnd = (HWND) TreeView_EditLabel(GetHwnd(), HITEM(item));
  
      m_textCtrl = (wxTextCtrl *)textControlClass->CreateObject();
      HWND hWnd = (HWND) TreeView_EditLabel(GetHwnd(), HITEM(item));
  
@@ -1959,20 +2007,20 @@ wxTextCtrl* wxTreeCtrl::EditLabel(const wxTreeItemId& item,
  }
  
  // End label editing, optionally cancelling the edit
  }
  
  // End label editing, optionally cancelling the edit
-void wxTreeCtrl::EndEditLabel(const wxTreeItemId& WXUNUSED(item), bool discardChanges)
+void wxTreeCtrl::DoEndEditLabel(bool discardChanges)
  {
      TreeView_EndEditLabelNow(GetHwnd(), discardChanges);
  
      DeleteTextCtrl();
  }
  
  {
      TreeView_EndEditLabelNow(GetHwnd(), discardChanges);
  
      DeleteTextCtrl();
  }
  
-wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
+wxTreeItemId wxTreeCtrl::DoTreeHitTest(const wxPoint& point, int& flags)
  {
      TV_HITTESTINFO hitTestInfo;
      hitTestInfo.pt.x = (int)point.x;
      hitTestInfo.pt.y = (int)point.y;
  
  {
      TV_HITTESTINFO hitTestInfo;
      hitTestInfo.pt.x = (int)point.x;
      hitTestInfo.pt.y = (int)point.y;
  
-    TreeView_HitTest(GetHwnd(), &hitTestInfo);
+    (void) TreeView_HitTest(GetHwnd(), &hitTestInfo);
  
      flags = 0;
  
  
      flags = 0;
  
@@ -2060,14 +2108,10 @@ int CALLBACK wxTreeSortHelper::Compare(LPARAM pItem1,
                                  GetIdFromData(tree, pItem2));
  }
  
                                  GetIdFromData(tree, pItem2));
  }
  
-int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
-                               const wxTreeItemId& item2)
-{
-    return wxStrcmp(GetItemText(item1), GetItemText(item2));
-}
-
  void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
  {
  void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
  {
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
      // rely on the fact that TreeView_SortChildren does the same thing as our
      // default behaviour, i.e. sorts items alphabetically and so call it
      // directly if we're not in derived class (much more efficient!)
      // rely on the fact that TreeView_SortChildren does the same thing as our
      // default behaviour, i.e. sorts items alphabetically and so call it
      // directly if we're not in derived class (much more efficient!)
@@ -2117,13 +2161,49 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id)
  // only do it during dragging, minimize wxWin overhead (this is important for
  // WM_MOUSEMOVE as they're a lot of them) by catching Windows messages directly
  // instead of passing by wxWin events
  // only do it during dragging, minimize wxWin overhead (this is important for
  // WM_MOUSEMOVE as they're a lot of them) by catching Windows messages directly
  // instead of passing by wxWin events
-long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
  {
      bool processed = false;
  {
      bool processed = false;
-    long rc = 0;
-    bool isMultiple = (GetWindowStyle() & wxTR_MULTIPLE) != 0;
+    WXLRESULT rc = 0;
+    bool isMultiple = HasFlag(wxTR_MULTIPLE);
+
+    // This message is sent after a right-click, or when the "menu" key is pressed
+    if ( nMsg == WM_CONTEXTMENU )
+    {
+        int x = GET_X_LPARAM(lParam),
+            y = GET_Y_LPARAM(lParam);
+        // Convert the screen point to a client point
+        wxPoint MenuPoint = ScreenToClient(wxPoint(x, y));
+
+        wxTreeEvent event( wxEVT_COMMAND_TREE_ITEM_MENU, GetId() );
+
+        // can't use GetSelection() here as it would assert in multiselect mode
+        event.m_item = wxTreeItemId(TreeView_GetSelection(GetHwnd()));
+        event.SetEventObject( this );
  
  
-    if ( (nMsg >= WM_MOUSEFIRST) && (nMsg <= WM_MOUSELAST) )
+        // Get the bounding rectangle for the item, including the non-text areas
+        wxRect ItemRect;
+        GetBoundingRect(event.m_item, ItemRect, false);
+        // If the point is inside the bounding rectangle, use it as the click position.
+        // This should be the case for WM_CONTEXTMENU as the result of a right-click
+        if (ItemRect.Inside(MenuPoint))
+        {
+            event.m_pointDrag = MenuPoint;
+        }
+        // Use the Explorer standard of putting the menu at the left edge of the text,
+        // in the vertical middle of the text. Should be the case for the "menu" key
+        else
+        {
+            // Use the bounding rectangle of only the text part
+            GetBoundingRect(event.m_item, ItemRect, true);
+            event.m_pointDrag = wxPoint(ItemRect.GetX(), ItemRect.GetY() + ItemRect.GetHeight() / 2);
+        }
+
+        if ( GetEventHandler()->ProcessEvent(event) )
+            processed = true;
+        //else: continue with generating wxEVT_CONTEXT_MENU in base class code
+    }
+    else if ( (nMsg >= WM_MOUSEFIRST) && (nMsg <= WM_MOUSELAST) )
      {
          // we only process mouse messages here and these parameters have the
          // same meaning for all of them
      {
          // we only process mouse messages here and these parameters have the
          // same meaning for all of them
@@ -2131,13 +2211,19 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
              y = GET_Y_LPARAM(lParam);
          HTREEITEM htItem = GetItemFromPoint(GetHwnd(), x, y);
  
              y = GET_Y_LPARAM(lParam);
          HTREEITEM htItem = GetItemFromPoint(GetHwnd(), x, y);
  
+        TV_HITTESTINFO tvht;
+        tvht.pt.x = x;
+        tvht.pt.y = y;
+
+        (void) TreeView_HitTest(GetHwnd(), &tvht);
+
          switch ( nMsg )
          {
              case WM_RBUTTONDOWN:
          switch ( nMsg )
          {
              case WM_RBUTTONDOWN:
-                // if the item we are about to right click on
-                // is not already select, remove the entire
-                // previous selection
-                if (!::IsItemSelected(GetHwnd(), htItem))
+                // if the item we are about to right click on is not already
+                // selected or if we click outside of any item, remove the
+                // entire previous selection
+                if ( !htItem || !::IsItemSelected(GetHwnd(), htItem) )
                  {
                      UnselectAll();
                  }
                  {
                      UnselectAll();
                  }
@@ -2150,14 +2236,17 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
  
  #if !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
              case WM_LBUTTONDOWN:
  
  #if !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
              case WM_LBUTTONDOWN:
-                if ( htItem && isMultiple )
+                if ( htItem && isMultiple && (tvht.flags & TVHT_ONITEM) != 0 )
                  {
                  {
+                    m_htClickedItem = (WXHTREEITEM) htItem;
+                    m_ptClick = wxPoint(x, y);
+
                      if ( wParam & MK_CONTROL )
                      {
                          SetFocus();
  
                          // toggle selected state
                      if ( wParam & MK_CONTROL )
                      {
                          SetFocus();
  
                          // toggle selected state
-                        ToggleItemSelection(GetHwnd(), htItem);
+                        ::ToggleItemSelection(GetHwnd(), htItem);
  
                          ::SetFocus(GetHwnd(), htItem);
  
  
                          ::SetFocus(GetHwnd(), htItem);
  
@@ -2177,8 +2266,11 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                              m_htSelStart = TreeView_GetSelection(GetHwnd());
                          }
  
                              m_htSelStart = TreeView_GetSelection(GetHwnd());
                          }
  
-                        SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem,
+                        if ( m_htSelStart )
+                            SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem,
                                      !(wParam & MK_CONTROL));
                                      !(wParam & MK_CONTROL));
+                        else
+                            ::SelectItem(GetHwnd(), htItem);
  
                          ::SetFocus(GetHwnd(), htItem);
  
  
                          ::SetFocus(GetHwnd(), htItem);
  
@@ -2188,23 +2280,21 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                      {
                          // avoid doing anything if we click on the only
                          // currently selected item
                      {
                          // avoid doing anything if we click on the only
                          // currently selected item
-                        
+
+                        SetFocus();
+
                          wxArrayTreeItemIds selections;
                          size_t count = GetSelections(selections);
                          if ( count == 0 ||
                               count > 1 ||
                          wxArrayTreeItemIds selections;
                          size_t count = GetSelections(selections);
                          if ( count == 0 ||
                               count > 1 ||
-                             HITEM_PTR(selections[0]) != htItem )
+                             HITEM(selections[0]) != htItem )
                          {
                              // clear the previously selected items, if the
                              // user clicked outside of the present selection.
                              // otherwise, perform the deselection on mouse-up.
                              // this allows multiple drag and drop to work.
                          {
                              // clear the previously selected items, if the
                              // user clicked outside of the present selection.
                              // otherwise, perform the deselection on mouse-up.
                              // this allows multiple drag and drop to work.
-                            
-                            if (IsItemSelected(GetHwnd(), htItem))
-                            {
-                                ::SetFocus(GetHwnd(), htItem);
-                            }
-                             else
+
+                            if (!IsItemSelected(GetHwnd(), htItem))
                              {
                                  UnselectAll();
  
                              {
                                  UnselectAll();
  
@@ -2216,6 +2306,8 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                                  TreeView_SelectItem(GetHwnd(), 0);
                                  ::SelectItem(GetHwnd(), htItem);
                              }
                                  TreeView_SelectItem(GetHwnd(), 0);
                                  ::SelectItem(GetHwnd(), htItem);
                              }
+                            ::SetFocus(GetHwnd(), htItem);
+                            processed = true;
                          }
  
                          // reset on any click without Shift
                          }
  
                          // reset on any click without Shift
@@ -2226,6 +2318,45 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
  #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
  
              case WM_MOUSEMOVE:
  #endif // wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
  
              case WM_MOUSEMOVE:
+#ifndef __WXWINCE__
+                if ( m_htClickedItem )
+                {
+                    int cx = abs(m_ptClick.x - x);
+                    int cy = abs(m_ptClick.y - y);
+
+                    if ( cx > GetSystemMetrics( SM_CXDRAG ) || cy > GetSystemMetrics( SM_CYDRAG ) )
+                    {
+                        HWND pWnd = ::GetParent( GetHwnd() );
+                        if ( pWnd )
+                        {
+                            NM_TREEVIEW tv;
+
+                            tv.hdr.hwndFrom = GetHwnd();
+                            tv.hdr.idFrom = ::GetWindowLong( GetHwnd(), GWL_ID );
+                            tv.hdr.code = TVN_BEGINDRAG;
+
+                            tv.itemNew.hItem = HITEM(m_htClickedItem);
+
+                            TVITEM tviAux;
+                            ZeroMemory(&tviAux, sizeof(tviAux));
+                            tviAux.hItem = HITEM(m_htClickedItem);
+                            tviAux.mask = TVIF_STATE | TVIF_PARAM;
+                            tviAux.stateMask = 0xffffffff;
+                            TreeView_GetItem( GetHwnd(), &tviAux );
+
+                            tv.itemNew.state = tviAux.state;
+                            tv.itemNew.lParam = tviAux.lParam;
+
+                            tv.ptDrag.x = x;
+                            tv.ptDrag.y = y;
+
+                            ::SendMessage( pWnd, WM_NOTIFY, tv.hdr.idFrom, (LPARAM)&tv );
+                        }
+                        m_htClickedItem.Unset();
+                    }
+                }
+#endif // __WXWINCE__
+
                  if ( m_dragImage )
                  {
                      m_dragImage->Move(wxPoint(x, y));
                  if ( m_dragImage )
                  {
                      m_dragImage->Move(wxPoint(x, y));
@@ -2254,7 +2385,10 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                      {
                          UnselectAll();
                          TreeView_SelectItem(GetHwnd(), htItem);
                      {
                          UnselectAll();
                          TreeView_SelectItem(GetHwnd(), htItem);
+                        ::SelectItem(GetHwnd(), htItem);
+                        ::SetFocus(GetHwnd(), htItem);
                      }
                      }
+                    m_htClickedItem.Unset();
                  }
  
                  // fall through
                  }
  
                  // fall through
@@ -2295,10 +2429,10 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
          {
              // TreeView_GetItemRect() will return false if item is not visible,
              // which may happen perfectly well
          {
              // TreeView_GetItemRect() will return false if item is not visible,
              // which may happen perfectly well
-            if ( TreeView_GetItemRect(GetHwnd(), HITEM_PTR(selections[n]),
-                                      &rect, true) )
+            if ( TreeView_GetItemRect(GetHwnd(), HITEM(selections[n]),
+                                      &rect, TRUE) )
              {
              {
-                ::InvalidateRect(GetHwnd(), &rect, false);
+                ::InvalidateRect(GetHwnd(), &rect, FALSE);
              }
          }
      }
              }
          }
      }
@@ -2307,84 +2441,145 @@ long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
          bool bCtrl = wxIsCtrlDown(),
               bShift = wxIsShiftDown();
  
          bool bCtrl = wxIsCtrlDown(),
               bShift = wxIsShiftDown();
  
-        // we handle.arrows and space, but not page up/down and home/end: the
-        // latter should be easy, but not the former
-
          HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
          HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
-        if ( !m_htSelStart )
-        {
-            m_htSelStart = htSel;
-        }
-
-        if ( wParam == VK_SPACE )
+        switch ( wParam )
          {
          {
-            if ( bCtrl )
-            {
-                ToggleItemSelection(GetHwnd(), htSel);
-            }
-            else
-            {
-                UnselectAll();
-
-                ::SelectItem(GetHwnd(), htSel);
-            }
+            case VK_SPACE:
+                if ( bCtrl )
+                {
+                    ::ToggleItemSelection(GetHwnd(), htSel);
+                }
+                else
+                {
+                    UnselectAll();
  
  
-            processed = true;
-        }
-        else if ( wParam == VK_UP || wParam == VK_DOWN )
-        {
-            if ( !bCtrl && !bShift )
-            {
-                // no modifiers, just clear selection and then let the default
-                // processing to take place
-                UnselectAll();
-            }
-            else if ( htSel )
-            {
-                (void)wxControl::MSWWindowProc(nMsg, wParam, lParam);
+                    ::SelectItem(GetHwnd(), htSel);
+                }
  
  
-                HTREEITEM htNext = (HTREEITEM)(wParam == VK_UP
-                                    ? TreeView_GetPrevVisible(GetHwnd(), htSel)
-                                    : TreeView_GetNextVisible(GetHwnd(), htSel));
+                processed = true;
+                break;
  
  
-                if ( !htNext )
+            case VK_UP:
+            case VK_DOWN:
+                if ( !bCtrl && !bShift )
                  {
                  {
-                    // at the top/bottom
-                    htNext = htSel;
+                    // no modifiers, just clear selection and then let the default
+                    // processing to take place
+                    UnselectAll();
                  }
                  }
-
-                if ( bShift )
+                else if ( htSel )
                  {
                  {
-                    SelectRange(GetHwnd(), HITEM(m_htSelStart), htNext);
+                    (void)wxControl::MSWWindowProc(nMsg, wParam, lParam);
+
+                    HTREEITEM htNext = (HTREEITEM)
+                        TreeView_GetNextItem
+                        (
+                            GetHwnd(),
+                            htSel,
+                            wParam == VK_UP ? TVGN_PREVIOUSVISIBLE
+                                            : TVGN_NEXTVISIBLE
+                        );
+
+                    if ( !htNext )
+                    {
+                        // at the top/bottom
+                        htNext = htSel;
+                    }
+
+                    if ( bShift )
+                    {
+                        if ( !m_htSelStart )
+                            m_htSelStart = htSel;
+
+                        SelectRange(GetHwnd(), HITEM(m_htSelStart), htNext);
+                    }
+                    else // bCtrl
+                    {
+                        // without changing selection
+                        ::SetFocus(GetHwnd(), htNext);
+                    }
+
+                    processed = true;
                  }
                  }
-                else // bCtrl
+                break;
+
+            case VK_HOME:
+            case VK_END:
+            case VK_PRIOR:
+            case VK_NEXT:
+                // TODO: handle Shift/Ctrl with these keys
+                if ( !bCtrl && !bShift )
                  {
                  {
-                    // without changing selection
-                    ::SetFocus(GetHwnd(), htNext);
+                    UnselectAll();
+
+                    m_htSelStart.Unset();
                  }
                  }
+        }
+    }
+#endif // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
+    else if ( nMsg == WM_COMMAND )
+    {
+        // if we receive a EN_KILLFOCUS command from the in-place edit control
+        // used for label editing, make sure to end editing
+        WORD id, cmd;
+        WXHWND hwnd;
+        UnpackCommand(wParam, lParam, &id, &hwnd, &cmd);
+
+        if ( cmd == EN_KILLFOCUS )
+        {
+            if ( m_textCtrl && m_textCtrl->GetHandle() == hwnd )
+            {
+                DoEndEditLabel();
  
                  processed = true;
              }
          }
      }
  
                  processed = true;
              }
          }
      }
-#endif // !wxUSE_CHECKBOXES_IN_MULTI_SEL_TREE
-    else if ( nMsg == WM_CHAR )
+
+    if ( !processed )
+        rc = wxControl::MSWWindowProc(nMsg, wParam, lParam);
+
+    return rc;
+}
+
+WXLRESULT
+wxTreeCtrl::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+{
+    // default WM_RBUTTONDOWN handler enters modal loop inside DefWindowProc()
+    // waiting for WM_RBUTTONUP and then sends the resulting WM_CONTEXTMENU to
+    // the parent window, not us, which completely breaks everything so simply
+    // don't let it see this message at all
+    if ( nMsg == WM_RBUTTONDOWN )
+        return 0;
+
+    // but because of the above we don't get NM_RCLICK which is normally
+    // generated by tree window proc when the modal loop mentioned above ends
+    // because the mouse is released -- synthesize it ourselves instead
+    if ( nMsg == WM_RBUTTONUP )
      {
      {
-        // don't let the control process Space and Return keys because it
+        NMHDR hdr;
+        hdr.hwndFrom = GetHwnd();
+        hdr.idFrom = GetId();
+        hdr.code = NM_RCLICK;
+
+        WXLPARAM rc;
+        MSWOnNotify(GetId(), (LPARAM)&hdr, &rc);
+
+        // continue as usual
+    }
+
+    if ( nMsg == WM_CHAR )
+    {
+        // also don't let the control process Space and Return keys because it
          // doesn't do anything useful with them anyhow but always beeps
          // annoyingly when it receives them and there is no way to turn it off
          // simply if you just process TREEITEM_ACTIVATED event to which Space
          // and Enter presses are mapped in your code
          if ( wParam == VK_SPACE || wParam == VK_RETURN )
          // doesn't do anything useful with them anyhow but always beeps
          // annoyingly when it receives them and there is no way to turn it off
          // simply if you just process TREEITEM_ACTIVATED event to which Space
          // and Enter presses are mapped in your code
          if ( wParam == VK_SPACE || wParam == VK_RETURN )
-        {
-            processed = true;
-        }
+            return 0;
      }
  
      }
  
-    if ( !processed )
-        rc = wxControl::MSWWindowProc(nMsg, wParam, lParam);
-
-    return rc;
+    return wxControl::MSWDefWindowProc(nMsg, wParam, lParam);
  }
  
  // process WM_NOTIFY Windows message
  }
  
  // process WM_NOTIFY Windows message
@@ -2423,6 +2618,10 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                  eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
                  TV_DISPINFO *info = (TV_DISPINFO *)lParam;
  
                  eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
                  TV_DISPINFO *info = (TV_DISPINFO *)lParam;
  
+                // although the user event handler may still veto it, it is
+                // important to set it now so that calls to SetItemText() from
+                // the event handler would change the text controls contents
+                m_idEdited =
                  event.m_item = info->item.hItem;
                  event.m_label = info->item.pszText;
                  event.m_editCancelled = false;
                  event.m_item = info->item.hItem;
                  event.m_label = info->item.pszText;
                  event.m_editCancelled = false;
@@ -2455,16 +2654,35 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
  
                  event.m_item = info->item.hItem;
                  event.m_label = info->item.pszText;
  
                  event.m_item = info->item.hItem;
                  event.m_label = info->item.pszText;
-                if (info->item.pszText == NULL)
-                {
-                    event.m_editCancelled = true;
-                }
-                 else
-                {
-                    event.m_editCancelled = false;
-                }
+                event.m_editCancelled = info->item.pszText == NULL;
+                break;
+            }
+
+#ifndef __WXWINCE__
+        // These *must* not be removed or TVN_GETINFOTIP will
+        // not be processed each time the mouse is moved
+        // and the tooltip will only ever update once.
+        case TTN_NEEDTEXTA:
+        case TTN_NEEDTEXTW:
+            {
+                *result = 0;
+
+                break;
+            }
+
+#ifdef TVN_GETINFOTIP
+        case TVN_GETINFOTIP:
+            {
+                eventType = wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP;
+                NMTVGETINFOTIP *info = (NMTVGETINFOTIP*)lParam;
+
+                // Which item are we trying to get a tooltip for?
+                event.m_item = info->hItem;
+
                  break;
              }
                  break;
              }
+#endif
+#endif
  
          case TVN_GETDISPINFO:
              eventType = wxEVT_COMMAND_TREE_GET_INFO;
  
          case TVN_GETDISPINFO:
              eventType = wxEVT_COMMAND_TREE_GET_INFO;
@@ -2520,8 +2738,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                  // fabricate the lParam and wParam parameters sufficiently
                  // similar to the ones from a "real" WM_KEYDOWN so that
                  // CreateKeyEvent() works correctly
                  // fabricate the lParam and wParam parameters sufficiently
                  // similar to the ones from a "real" WM_KEYDOWN so that
                  // CreateKeyEvent() works correctly
-                WXLPARAM lParam =
-                     (::GetKeyState(VK_MENU) < 0 ? KF_ALTDOWN : 0) << 16;
+                const bool isAltDown = ::GetKeyState(VK_MENU) < 0;
+                WXLPARAM lParam = (isAltDown ? KF_ALTDOWN : 0) << 16;
  
                  WXWPARAM wParam = info->wVKey;
  
  
                  WXWPARAM wParam = info->wVKey;
  
@@ -2539,7 +2757,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                                                  wParam);
  
                  // a separate event for Space/Return
                                                  wParam);
  
                  // a separate event for Space/Return
-                if ( !wxIsCtrlDown() && !wxIsShiftDown() &&
+                if ( !wxIsCtrlDown() && !wxIsShiftDown() && !isAltDown &&
                       ((info->wVKey == VK_SPACE) || (info->wVKey == VK_RETURN)) )
                  {
                      wxTreeEvent event2(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
                       ((info->wVKey == VK_SPACE) || (info->wVKey == VK_RETURN)) )
                  {
                      wxTreeEvent event2(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
@@ -2556,7 +2774,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
              }
              break;
  
              }
              break;
  
-        // NB: MSLU is broken and sends TVN_SELCHANGEDA instead of 
+        // NB: MSLU is broken and sends TVN_SELCHANGEDA instead of
          //     TVN_SELCHANGEDW in Unicode mode under Win98. Therefore
          //     we have to handle both messages:
          case TVN_SELCHANGEDA:
          //     TVN_SELCHANGEDW in Unicode mode under Win98. Therefore
          //     we have to handle both messages:
          case TVN_SELCHANGEDA:
@@ -2571,7 +2789,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                      eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
                  //else: already set above
  
                      eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
                  //else: already set above
  
-                if (hdr->code == TVN_SELCHANGINGW || 
+                if (hdr->code == TVN_SELCHANGINGW ||
                      hdr->code == TVN_SELCHANGEDW)
                  {
                      NM_TREEVIEWW* tv = (NM_TREEVIEWW *)lParam;
                      hdr->code == TVN_SELCHANGEDW)
                  {
                      NM_TREEVIEWW* tv = (NM_TREEVIEWW *)lParam;
@@ -2617,60 +2835,42 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
  
                              wxTreeItemAttr * const attr = it->second;
  
  
                              wxTreeItemAttr * const attr = it->second;
  
-                            HFONT hFont;
-                            if ( attr->HasFont() )
-                            {
-                                hFont = GetHfontOf(attr->GetFont());
-                            }
-                            else
-                            {
-                                hFont = 0;
-                            }
-
-                            wxColour colText;
-                            if ( attr->HasTextColour() )
-                            {
-                                colText = attr->GetTextColour();
-                            }
-                            else
-                            {
-                                colText = GetForegroundColour();
-                            }
-
-                            // selection colours should override ours
-                            if ( nmcd.uItemState & CDIS_SELECTED )
-                            {
-                                lptvcd->clrTextBk =
-                                    ::GetSysColor(COLOR_HIGHLIGHT);
-                                lptvcd->clrText =
-                                    ::GetSysColor(COLOR_HIGHLIGHTTEXT);
-                            }
-                            else // !selected
+                            // selection colours should override ours,
+                            // otherwise it is too confusing ot the user
+                            if ( !(nmcd.uItemState & CDIS_SELECTED) )
                              {
                                  wxColour colBack;
                                  if ( attr->HasBackgroundColour() )
                                  {
                                      colBack = attr->GetBackgroundColour();
                              {
                                  wxColour colBack;
                                  if ( attr->HasBackgroundColour() )
                                  {
                                      colBack = attr->GetBackgroundColour();
+                                    lptvcd->clrTextBk = wxColourToRGB(colBack);
                                  }
                                  }
-                                else
+                            }
+
+                            // but we still want to keep the special foreground
+                            // colour when we don't have focus (we can't keep
+                            // it when we do, it would usually be unreadable on
+                            // the almost inverted bg colour...)
+                            if ( !(nmcd.uItemState & CDIS_SELECTED) ||
+                                    FindFocus() != this )
+                            {
+                                wxColour colText;
+                                if ( attr->HasTextColour() )
                                  {
                                  {
-                                    colBack = GetBackgroundColour();
+                                    colText = attr->GetTextColour();
+                                    lptvcd->clrText = wxColourToRGB(colText);
                                  }
                                  }
-
-                                lptvcd->clrText = wxColourToRGB(colText);
-                                lptvcd->clrTextBk = wxColourToRGB(colBack);
                              }
  
                              }
  
-                            // note that if we wanted to set colours for
-                            // individual columns (subitems), we would have
-                            // returned CDRF_NOTIFYSUBITEMREDRAW from here
-                            if ( hFont )
+                            if ( attr->HasFont() )
                              {
                              {
+                                HFONT hFont = GetHfontOf(attr->GetFont());
+
                                  ::SelectObject(nmcd.hdc, hFont);
  
                                  *result = CDRF_NEWFONT;
                              }
                                  ::SelectObject(nmcd.hdc, hFont);
  
                                  *result = CDRF_NEWFONT;
                              }
-                            else
+                            else // no specific font
                              {
                                  *result = CDRF_DODEFAULT;
                              }
                              {
                                  *result = CDRF_DODEFAULT;
                              }
@@ -2756,14 +2956,14 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                  wxASSERT_MSG( !m_dragImage, _T("starting to drag once again?") );
  
                  m_dragImage = new wxDragImage(*this, event.m_item);
                  wxASSERT_MSG( !m_dragImage, _T("starting to drag once again?") );
  
                  m_dragImage = new wxDragImage(*this, event.m_item);
-                m_dragImage->BeginDrag(wxPoint(0, 0), this);
+                m_dragImage->BeginDrag(wxPoint(0,0), this);
                  m_dragImage->Show();
              }
              break;
  
          case TVN_DELETEITEM:
              {
                  m_dragImage->Show();
              }
              break;
  
          case TVN_DELETEITEM:
              {
-                // NB: we might process this message using wxWindows event
+                // NB: we might process this message using wxWidgets event
                  //     tables, but due to overhead of wxWin event system we
                  //     prefer to do it here ourself (otherwise deleting a tree
                  //     with many items is just too slow)
                  //     tables, but due to overhead of wxWin event system we
                  //     prefer to do it here ourself (otherwise deleting a tree
                  //     with many items is just too slow)
@@ -2789,13 +2989,14 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
          case TVN_BEGINLABELEDIT:
              // return true to cancel label editing
              *result = !event.IsAllowed();
          case TVN_BEGINLABELEDIT:
              // return true to cancel label editing
              *result = !event.IsAllowed();
+
              // set ES_WANTRETURN ( like we do in BeginLabelEdit )
              // set ES_WANTRETURN ( like we do in BeginLabelEdit )
-            if(event.IsAllowed())
+            if ( event.IsAllowed() )
              {
                  HWND hText = TreeView_GetEditControl(GetHwnd());
                  if(hText != NULL)
                  {
              {
                  HWND hText = TreeView_GetEditControl(GetHwnd());
                  if(hText != NULL)
                  {
-                    // MBN: if m_textCtrl already has an HWND, it is a stale 
+                    // MBN: if m_textCtrl already has an HWND, it is a stale
                      // pointer from a previous edit (because the user
                      // didn't modify the label before dismissing the control,
                      // and TVN_ENDLABELEDIT was not sent), so delete it
                      // pointer from a previous edit (because the user
                      // didn't modify the label before dismissing the control,
                      // and TVN_ENDLABELEDIT was not sent), so delete it
@@ -2815,6 +3016,10 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                                                 | wxTE_PROCESS_ENTER);
                  }
              }
                                                 | wxTE_PROCESS_ENTER);
                  }
              }
+            else // we had set m_idEdited before
+            {
+                m_idEdited.Unset();
+            }
              break;
  
          case TVN_ENDLABELEDIT:
              break;
  
          case TVN_ENDLABELEDIT:
@@ -2830,6 +3035,20 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
              DeleteTextCtrl();
              break;
  
              DeleteTextCtrl();
              break;
  
+#ifndef __WXWINCE__
+#ifdef TVN_GETINFOTIP
+         case TVN_GETINFOTIP:
+            {
+                // If the user permitted a tooltip change, change it
+                if (event.IsAllowed())
+                {
+                    SetToolTip(event.m_label);
+                }
+            }
+            break;
+#endif
+#endif
+
          case TVN_SELCHANGING:
          case TVN_ITEMEXPANDING:
              // return true to prevent the action from happening
          case TVN_SELCHANGING:
          case TVN_ITEMEXPANDING:
              // return true to prevent the action from happening
@@ -2906,7 +3125,7 @@ void wxTreeCtrl::SetState(const wxTreeItemId& node, int state)
      // Select the specified state, or -1 == cycle to the next one.
      if ( state == -1 )
      {
      // Select the specified state, or -1 == cycle to the next one.
      if ( state == -1 )
      {
-        TreeView_GetItem(GetHwnd(), &tvi); 
+        TreeView_GetItem(GetHwnd(), &tvi);
  
          state = STATEIMAGEMASKTOINDEX(tvi.state) + 1;
          if ( state == m_imageListState->GetImageCount() )
  
          state = STATEIMAGEMASKTOINDEX(tvi.state) + 1;
          if ( state == m_imageListState->GetImageCount() )
@@ -2916,7 +3135,7 @@ void wxTreeCtrl::SetState(const wxTreeItemId& node, int state)
      wxCHECK_RET( state < m_imageListState->GetImageCount(),
                   _T("wxTreeCtrl::SetState(): item index out of bounds") );
  
      wxCHECK_RET( state < m_imageListState->GetImageCount(),
                   _T("wxTreeCtrl::SetState(): item index out of bounds") );
  
-    tvi.state = INDEXTOSTATEIMAGEMASK(state); 
+    tvi.state = INDEXTOSTATEIMAGEMASK(state);
  
      TreeView_SetItem(GetHwnd(), &tvi);
  }
  
      TreeView_SetItem(GetHwnd(), &tvi);
  }
@@ -2927,10 +3146,9 @@ int wxTreeCtrl::GetState(const wxTreeItemId& node)
      tvi.hItem = (HTREEITEM)node.m_pItem;
      tvi.mask = TVIF_STATE;
      tvi.stateMask = TVIS_STATEIMAGEMASK;
      tvi.hItem = (HTREEITEM)node.m_pItem;
      tvi.mask = TVIF_STATE;
      tvi.stateMask = TVIS_STATEIMAGEMASK;
-    TreeView_GetItem(GetHwnd(), &tvi); 
+    TreeView_GetItem(GetHwnd(), &tvi);
  
      return STATEIMAGEMASKTOINDEX(tvi.state);
  }
  
  #endif // wxUSE_TREECTRL
  
      return STATEIMAGEMASKTOINDEX(tvi.state);
  }
  
  #endif // wxUSE_TREECTRL
-