]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/treectrl.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
wxCaret MSW bug fixes
[wxWidgets.git] / src / msw / treectrl.cpp
diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 6ad24a23ddbf016c47416c13a1f9dfd074d6c3c5..07ff06e610949d6cf23614697a10400d59dd0f1b 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -1,930 +1,1076 @@
-/*
- * File:  TreeCtrl.cpp
- * Purpose: Tree control
- * Author:  Julian Smart
- * Created: 1997
- * Updated: 
- * Copyright:
- */
-
-/* static const char sccsid[] = "%W% %G%"; */
-
+/////////////////////////////////////////////////////////////////////////////
+// Name:        treectrl.cpp
+// Purpose:     wxTreeCtrl
+// Author:      Julian Smart
+// Modified by: Vadim Zeitlin to be less MSW-specific on 10.10.98
+// Created:     1997
+// RCS-ID:      $Id$
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
 #ifdef __GNUG__
 #ifdef __GNUG__
-#pragma implementation "treectrl.h"
+    #pragma implementation "treectrl.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP
-#include "wx.h"
+    #include "wx/wx.h"
 #endif
 
 #endif
 
-#include "wx/log.h"
-
 #if defined(__WIN95__)
 
 #if defined(__WIN95__)
 
-#include "wx/treectrl.h"
+#include "wx/log.h"
+#include "wx/dynarray.h"
+#include "wx/imaglist.h"
+#include "wx/msw/treectrl.h"
+
 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"
 
-#ifndef __GNUWIN32__
-#include <commctrl.h>
+#ifdef __GNUWIN32__
+#include "wx/msw/gnuwin32/extra.h"
+#endif
+
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+    #include <commctrl.h>
 #endif
 
 // Bug in headers, sometimes
 #ifndef TVIS_FOCUSED
 #endif
 
 // Bug in headers, sometimes
 #ifndef TVIS_FOCUSED
-#define TVIS_FOCUSED            0x0001
+    #define TVIS_FOCUSED            0x0001
 #endif
 
 #endif
 
-static void wxConvertToMSWTreeItem(wxTreeItem& info, TV_ITEM& tvItem);
-static void wxConvertFromMSWTreeItem(wxTreeItem& info, TV_ITEM& tvItem, HWND getFullInfo = 0);
+// ----------------------------------------------------------------------------
+// private classes
+// ----------------------------------------------------------------------------
 
 
-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject)
+// a convenient wrapper around TV_ITEM struct which adds a ctor
+struct wxTreeViewItem : public TV_ITEM
+{
+    wxTreeViewItem(const wxTreeItemId& item,
+                   UINT mask_, UINT stateMask_ = 0)
+    {
+        mask = mask_;
+        stateMask = stateMask_;
+        hItem = (HTREEITEM) (WXHTREEITEM) item;
+    }
+};
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------
 
 
+#if !USE_SHARED_LIBRARY
+    IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
 #endif
 
 #endif
 
-wxTreeCtrl::wxTreeCtrl(void)
+// hide the ugly cast (of course, the macro is _quite_ ugly too...)
+#define wxhWnd    ((HWND)m_hWnd)
+
+// ----------------------------------------------------------------------------
+// variables
+// ----------------------------------------------------------------------------
+
+// handy table for sending events
+static const wxEventType g_events[2][2] =
 {
 {
-  m_imageListNormal = NULL;
-  m_imageListState = NULL;
+    { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxEVT_COMMAND_TREE_ITEM_COLLAPSING },
+    { wxEVT_COMMAND_TREE_ITEM_EXPANDED,  wxEVT_COMMAND_TREE_ITEM_EXPANDING  }
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// construction and destruction
+// ----------------------------------------------------------------------------
+
+void wxTreeCtrl::Init()
+{
+    m_imageListNormal = NULL;
+    m_imageListState = NULL;
+    m_textCtrl = NULL;
 }
 
 }
 
-bool wxTreeCtrl::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
-            const long style, const wxValidator& validator, const wxString& name)
+bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
+                        const wxPoint& pos, const wxSize& size,
+                        long style, const wxValidator& validator,
+                        const wxString& name)
 {
 {
-  wxSystemSettings settings;
-  SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
-  SetForegroundColour(parent->GetDefaultForegroundColour());
+    Init();
+
+    wxSystemSettings settings;
 
 
-  SetName(name);
-  SetValidator(validator);
+    SetName(name);
+    SetValidator(validator);
 
 
-  m_imageListNormal = NULL;
-  m_imageListState = NULL;
+    m_windowStyle = style;
 
 
-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+    SetParent(parent);
 
 
-  m_windowStyle = style;
+    m_windowId = (id == -1) ? NewControlId() : id;
 
 
-//  SetFont(wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL));
+    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_SHOWSELALWAYS ;
 
 
-  SetParent(parent);
 
 
-  if (width <= 0)
-    width = 100;
-  if (height <= 0)
-    height = 30;
-  if (x < 0)
-    x = 0;
-  if (y < 0)
-    y = 0;
+    bool want3D;
+    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
 
 
-  m_windowId = (id == -1) ? NewControlId() : id;
+    // Even with extended styles, need to combine with WS_BORDER
+    // for them to look right.
+    if ( want3D || wxStyleHasBorder(m_windowStyle) )
+    {
+        wstyle |= WS_BORDER;
+    }
 
 
-  DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES;
-  
-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+    if ( m_windowStyle & wxTR_HAS_BUTTONS )
+        wstyle |= TVS_HASBUTTONS;
 
 
-  // Even with extended styles, need to combine with WS_BORDER
-  // for them to look right.
-  if (want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER) ||
-       (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER))
-    wstyle |= WS_BORDER;
+    if ( m_windowStyle & wxTR_EDIT_LABELS )
+        wstyle |= TVS_EDITLABELS;
 
 
-  if ( m_windowStyle & wxTR_HAS_BUTTONS )
-    wstyle |= TVS_HASBUTTONS;
+    if ( m_windowStyle & wxTR_LINES_AT_ROOT )
+        wstyle |= TVS_LINESATROOT;
 
 
-  if ( m_windowStyle & wxTR_EDIT_LABELS )
-    wstyle |= TVS_EDITLABELS;
+    // Create the tree control.
+    m_hWnd = (WXHWND)::CreateWindowEx
+                       (
+                        exStyle,
+                        WC_TREEVIEW,
+                        "",
+                        wstyle,
+                        pos.x, pos.y, size.x, size.y,
+                        (HWND)parent->GetHWND(),
+                        (HMENU)m_windowId,
+                        wxGetInstance(),
+                        NULL
+                       );
 
 
-  if ( m_windowStyle & wxTR_LINES_AT_ROOT )
-    wstyle |= TVS_LINESATROOT;
+    wxCHECK_MSG( m_hWnd, FALSE, "Failed to create tree ctrl" );
 
 
-  // Create the toolbar control.
-  HWND hWndTreeControl = CreateWindowEx(exStyle,
-    WC_TREEVIEW,
-    "",
-    wstyle,
-    x, y, width, height,
-    (HWND) parent->GetHWND(),
-    (HMENU)m_windowId,
-    wxGetInstance(),
-    NULL );
+    if ( parent )
+        parent->AddChild(this);
 
 
-  m_hWnd = (WXHWND) hWndTreeControl;
-  if (parent) parent->AddChild(this);
-  
-  SubclassWin((WXHWND) m_hWnd);
+    SubclassWin(m_hWnd);
 
 
-  return TRUE;
+    return TRUE;
 }
 
 }
 
-wxTreeCtrl::~wxTreeCtrl(void)
+wxTreeCtrl::~wxTreeCtrl()
 {
 {
-  m_textCtrl.SetHWND((WXHWND) NULL);
+    DeleteTextCtrl();
+
+    // delete user data to prevent memory leaks
+    DeleteAllItems();
 }
 
 }
 
-// Attributes
-int wxTreeCtrl::GetCount(void) const
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
+
+// simple wrappers which add error checking in debug mode
+
+bool wxTreeCtrl::DoGetItem(wxTreeViewItem* tvItem) const
 {
 {
-  return (int) TreeView_GetCount((HWND) GetHWND());
+    if ( !TreeView_GetItem(wxhWnd, tvItem) )
+    {
+        wxLogLastError("TreeView_GetItem");
+
+        return FALSE;
+    }
+
+    return TRUE;
 }
 
 }
 
-int wxTreeCtrl::GetIndent(void) const
+void wxTreeCtrl::DoSetItem(wxTreeViewItem* tvItem)
 {
 {
-  return (int) TreeView_GetIndent((HWND) GetHWND());
+    if ( TreeView_SetItem(wxhWnd, tvItem) == -1 )
+    {
+        wxLogLastError("TreeView_SetItem");
+    }
 }
 
 }
 
-void wxTreeCtrl::SetIndent(int indent)
+size_t wxTreeCtrl::GetCount() const
 {
 {
-  TreeView_SetIndent((HWND) GetHWND(), indent);
+    return (size_t)TreeView_GetCount(wxhWnd);
 }
 
 }
 
-wxImageList *wxTreeCtrl::GetImageList(const int which) const
+unsigned int wxTreeCtrl::GetIndent() const
+{
+    return TreeView_GetIndent(wxhWnd);
+}
+
+void wxTreeCtrl::SetIndent(unsigned int indent)
+{
+    TreeView_SetIndent(wxhWnd, indent);
+}
+
+wxImageList *wxTreeCtrl::GetImageList() const
 {
 {
-  if ( which == wxIMAGE_LIST_NORMAL )
-    {
     return m_imageListNormal;
     return m_imageListNormal;
-  }
-  else if ( which == wxIMAGE_LIST_STATE )
-    {
-    return m_imageListState;
-  }
-  return NULL;
 }
 
 }
 
-void wxTreeCtrl::SetImageList(wxImageList *imageList, const int which)
+wxImageList *wxTreeCtrl::GetStateImageList() const
 {
 {
-  int flags = 0;
-  if ( which == wxIMAGE_LIST_NORMAL )
-    {
-    flags = TVSIL_NORMAL;
-    m_imageListNormal = imageList;
-  }
-  else if ( which == wxIMAGE_LIST_STATE )
+    return m_imageListNormal;
+}
+
+void wxTreeCtrl::SetAnyImageList(wxImageList *imageList, int which)
+{
+    // no error return
+    TreeView_SetImageList(wxhWnd,
+                          imageList ? imageList->GetHIMAGELIST() : 0,
+                          which);
+}
+
+void wxTreeCtrl::SetImageList(wxImageList *imageList)
+{
+    SetAnyImageList(m_imageListNormal = imageList, TVSIL_NORMAL);
+}
+
+void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
+{
+    SetAnyImageList(m_imageListState = imageList, TVSIL_STATE);
+}
+
+size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
+{
+    long cookie;
+
+    size_t result = 0;
+
+    wxArrayLong children;
+    wxTreeItemId child = GetFirstChild(item, cookie);
+    while ( child.IsOk() )
     {
     {
-    flags = TVSIL_STATE;
-    m_imageListState = imageList;
-  }
-  TreeView_SetImageList((HWND) GetHWND(), (HIMAGELIST) imageList ? imageList->GetHIMAGELIST() : 0, flags);
+        if ( recursively )
+        {
+            // recursive call
+            result += GetChildrenCount(child, TRUE);
+        }
+
+        // add the child to the result in any case
+        result++;
+
+        child = GetNextChild(item, cookie);
+    }
+
+    return result;
 }
 
 }
 
-long wxTreeCtrl::GetNextItem(const long item, int code) const
+// ----------------------------------------------------------------------------
+// Item access
+// ----------------------------------------------------------------------------
+
+wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {
 {
-  UINT flag = 0;
-  switch ( code )
-  {
-    case wxTREE_NEXT_CARET:
-      flag = TVGN_CARET;
-      break;
-    case wxTREE_NEXT_CHILD:
-      flag = TVGN_CHILD;
-      break;
-    case wxTREE_NEXT_DROPHILITE:
-      flag = TVGN_DROPHILITE;
-      break;
-    case wxTREE_NEXT_FIRSTVISIBLE:
-      flag = TVGN_FIRSTVISIBLE;
-      break;
-    case wxTREE_NEXT_NEXT:
-      flag = TVGN_NEXT;
-      break;
-    case wxTREE_NEXT_NEXTVISIBLE:
-      flag = TVGN_NEXTVISIBLE;
-      break;
-    case wxTREE_NEXT_PARENT:
-      flag = TVGN_PARENT;
-      break;
-    case wxTREE_NEXT_PREVIOUS:
-      flag = TVGN_PREVIOUS;
-      break;
-    case wxTREE_NEXT_PREVIOUSVISIBLE:
-      flag = TVGN_PREVIOUSVISIBLE;
-      break;
-    case wxTREE_NEXT_ROOT:
-      flag = TVGN_ROOT;
-      break;
+    char buf[512];  // the size is arbitrary...
+
+    wxTreeViewItem tvItem(item, TVIF_TEXT);
+    tvItem.pszText = buf;
+    tvItem.cchTextMax = WXSIZEOF(buf);
+    if ( !DoGetItem(&tvItem) )
+    {
+        // don't return some garbage which was on stack, but an empty string
+        buf[0] = '\0';
+    }
 
 
-    default :
-      break;
-  }
-  return (long) TreeView_GetNextItem( (HWND) GetHWND(), (HTREEITEM) item, flag);
+    return wxString(buf);
 }
 
 }
 
-bool wxTreeCtrl::ItemHasChildren(const long item) const
+void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
 {
 {
-  TV_ITEM item2;
-  item2.hItem = (HTREEITEM) item;
-  item2.mask = TVIF_CHILDREN;
-  TreeView_GetItem((HWND) GetHWND(), &item2);
-  return (item2.cChildren != 0);
+    wxTreeViewItem tvItem(item, TVIF_TEXT);
+    tvItem.pszText = (char *)text.c_str();  // conversion is ok
+    DoSetItem(&tvItem);
 }
 
 }
 
-long wxTreeCtrl::GetChild(const long item) const
+int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const
 {
 {
-  return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)item);
+    wxTreeViewItem tvItem(item, TVIF_IMAGE);
+    DoGetItem(&tvItem);
+
+    return tvItem.iImage;
 }
 
 }
 
-long wxTreeCtrl::GetParent(const long item) const
+void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
 {
 {
-  return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)item);
+    wxTreeViewItem tvItem(item, TVIF_IMAGE);
+    tvItem.iImage = image;
+    DoSetItem(&tvItem);
 }
 
 }
 
-long wxTreeCtrl::GetFirstVisibleItem(void) const
+int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
 {
 {
-  return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_FIRSTVISIBLE, 0);
+    wxTreeViewItem tvItem(item, TVIF_SELECTEDIMAGE);
+    DoGetItem(&tvItem);
+
+    return tvItem.iSelectedImage;
 }
 
 }
 
-long wxTreeCtrl::GetNextVisibleItem(const long item) const
+void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
 {
 {
-  return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_NEXTVISIBLE, (LPARAM)item);
+    wxTreeViewItem tvItem(item, TVIF_SELECTEDIMAGE);
+    tvItem.iSelectedImage = image;
+    DoSetItem(&tvItem);
 }
 
 }
 
-long wxTreeCtrl::GetSelection(void) const
+wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
 {
 {
-  return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_CARET, 0);
+    wxTreeViewItem tvItem(item, TVIF_PARAM);
+    if ( !DoGetItem(&tvItem) )
+    {
+        return NULL;
+    }
+
+    return (wxTreeItemData *)tvItem.lParam;
 }
 
 }
 
-long wxTreeCtrl::GetRootItem(void) const
+void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)
 {
 {
-  return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_ROOT, 0);
+    wxTreeViewItem tvItem(item, TVIF_PARAM);
+    tvItem.lParam = (LPARAM)data;
+    DoSetItem(&tvItem);
 }
 
 }
 
-// TODO: convert mask
-bool wxTreeCtrl::GetItem(wxTreeItem& info) const
+void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
 {
 {
-  TV_ITEM tvItem;
-  tvItem.hItem   = (HTREEITEM)info.m_itemId;
-  tvItem.pszText = NULL;
-  tvItem.mask    = 0;
-  if ( info.m_mask & wxTREE_MASK_TEXT )
-  {
-    tvItem.mask |= TVIF_TEXT;
-    tvItem.pszText = new char[513];
-    tvItem.cchTextMax = 512;
-  }
-  if ( info.m_mask & wxTREE_MASK_DATA )
-    tvItem.mask |= TVIF_PARAM;
+    wxTreeViewItem tvItem(item, TVIF_CHILDREN);
+    tvItem.cChildren = (int)has;
+    DoSetItem(&tvItem);
+}
 
 
-  bool success = TreeView_GetItem((HWND)GetHWND(), &tvItem) != 0;
+void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
+{
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_BOLD);
+    tvItem.state = bold ? TVIS_BOLD : 0;
+    DoSetItem(&tvItem);
+}
 
 
-  if ( !success )
-  {
-    wxLogSysError("TreeView_GetItem failed");
+void wxTreeCtrl::SetItemDropHighlight(const wxTreeItemId& item, bool highlight)
+{
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_DROPHILITED);
+    tvItem.state = highlight ? TVIS_DROPHILITED : 0;
+    DoSetItem(&tvItem);
+}
 
 
-    if (tvItem.pszText)
-      delete[] tvItem.pszText;
+// ----------------------------------------------------------------------------
+// Item status
+// ----------------------------------------------------------------------------
 
 
-    return FALSE;
-  }
+bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
+{
+    // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect
+    RECT rect;
+    return SendMessage(wxhWnd, TVM_GETITEMRECT, FALSE, (LPARAM)&rect) != 0;
 
 
-  wxConvertFromMSWTreeItem(info, tvItem);
+}
 
 
-  if (tvItem.pszText)
-    delete[] tvItem.pszText;
+bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
+{
+    wxTreeViewItem tvItem(item, TVIF_CHILDREN);
+    DoGetItem(&tvItem);
 
 
-  return success;
+    return tvItem.cChildren != 0;
 }
 
 }
 
-bool wxTreeCtrl::SetItem(wxTreeItem& info)
+bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const
 {
 {
-  TV_ITEM item;
-    wxConvertToMSWTreeItem(info, item);
-  return (::SendMessage((HWND) GetHWND(), TVM_SETITEM, 0, (LPARAM)&item) != 0);
+    // probably not a good idea to put it here
+    //wxASSERT( ItemHasChildren(item) );
+
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_EXPANDED);
+    DoGetItem(&tvItem);
+
+    return (tvItem.state & TVIS_EXPANDED) != 0;
 }
 
 }
 
-int  wxTreeCtrl::GetItemState(const long item, const long stateMask) const
+bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
 {
 {
-  wxTreeItem info;
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_SELECTED);
+    DoGetItem(&tvItem);
 
 
-  info.m_mask = wxTREE_MASK_STATE ;
-  info.m_stateMask = stateMask;
-  info.m_itemId = item;
+    return (tvItem.state & TVIS_SELECTED) != 0;
+}
 
 
-  if (!GetItem(info))
-    return 0;
+bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
+{
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_BOLD);
+    DoGetItem(&tvItem);
 
 
-  return info.m_state;
+    return (tvItem.state & TVIS_BOLD) != 0;
 }
 
 }
 
-bool wxTreeCtrl::SetItemState(const long item, const long state, const long stateMask)
+// ----------------------------------------------------------------------------
+// navigation
+// ----------------------------------------------------------------------------
+
+wxTreeItemId wxTreeCtrl::GetRootItem() const
 {
 {
-  wxTreeItem info;
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetRoot(wxhWnd));
+}
 
 
-  info.m_mask = wxTREE_MASK_STATE ;
-  info.m_state = state;
-  info.m_stateMask = stateMask;
-  info.m_itemId = item;
+wxTreeItemId wxTreeCtrl::GetSelection() const
+{
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetSelection(wxhWnd));
+}
 
 
-  return SetItem(info);
+wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
+{
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetParent(wxhWnd, (HTREEITEM) (WXHTREEITEM) item));
 }
 
 }
 
-bool wxTreeCtrl::SetItemImage(const long item, const int image, const int selImage)
+wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
+                                       long& _cookie) const
 {
 {
-  wxTreeItem info;
+    // remember the last child returned in 'cookie'
+    _cookie = (long)TreeView_GetChild(wxhWnd, (HTREEITEM) (WXHTREEITEM)item);
+
+    return wxTreeItemId((WXHTREEITEM)_cookie);
+}
 
 
-  info.m_mask = wxTREE_MASK_IMAGE ;
-  info.m_image = image;
-  if ( selImage > -1)
-  {
-    info.m_selectedImage = selImage;
-    info.m_mask |= wxTREE_MASK_SELECTED_IMAGE;
-  }
-  info.m_itemId = item;
+wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
+                                      long& _cookie) const
+{
+    wxTreeItemId l = wxTreeItemId((WXHTREEITEM)TreeView_GetNextSibling(wxhWnd,
+                                   (HTREEITEM)(WXHTREEITEM)_cookie));
+    _cookie = (long)l;
 
 
-  return SetItem(info);
+    return l;
 }
 
 }
 
-wxString wxTreeCtrl::GetItemText(const long item) const
+wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
 {
 {
-  wxTreeItem info;
+    // can this be done more efficiently?
+    long cookie;
 
 
-  info.m_mask = wxTREE_MASK_TEXT ;
-  info.m_itemId = item;
+    wxTreeItemId childLast,
+    child = GetFirstChild(item, cookie);
+    while ( child.IsOk() )
+    {
+        childLast = child;
+        child = GetNextChild(item, cookie);
+    }
 
 
-  if (!GetItem(info))
-    return wxString("");
-  return info.m_text;
+    return childLast;
 }
 
 }
 
-void wxTreeCtrl::SetItemText(const long item, const wxString& str)
+wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
 {
 {
-  wxTreeItem info;
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(wxhWnd, (HTREEITEM) (WXHTREEITEM) item));
+}
 
 
-  info.m_mask = wxTREE_MASK_TEXT ;
-  info.m_itemId = item;
-  info.m_text = str;
+wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
+{
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevSibling(wxhWnd, (HTREEITEM) (WXHTREEITEM) item));
+}
 
 
-  SetItem(info);
+wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
+{
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetFirstVisible(wxhWnd));
 }
 
 }
 
-long wxTreeCtrl::GetItemData(const long item) const
+wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {
 {
-  wxTreeItem info;
+    wxASSERT_MSG( IsVisible(item), "The item you call GetNextVisible() "
+                                   "for must be visible itself!");
 
 
-  info.m_mask = wxTREE_MASK_DATA ;
-  info.m_itemId = item;
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetNextVisible(wxhWnd, (HTREEITEM) (WXHTREEITEM) item));
+}
+
+wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
+{
+    wxASSERT_MSG( IsVisible(item), "The item you call GetPrevVisible() "
+                                   "for must be visible itself!");
 
 
-  if (!GetItem(info))
-    return 0;
-  return info.m_data;
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevVisible(wxhWnd, (HTREEITEM) (WXHTREEITEM) item));
 }
 
 }
 
-bool wxTreeCtrl::SetItemData(const long item, long data)
+// ----------------------------------------------------------------------------
+// Usual operations
+// ----------------------------------------------------------------------------
+
+wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
+                                      wxTreeItemId hInsertAfter,
+                                      const wxString& text,
+                                      int image, int selectedImage,
+                                      wxTreeItemData *data)
 {
 {
-  wxTreeItem info;
+    TV_INSERTSTRUCT tvIns;
+    tvIns.hParent = (HTREEITEM) (WXHTREEITEM)parent;
+    tvIns.hInsertAfter = (HTREEITEM) (WXHTREEITEM) hInsertAfter;
+
+    // This is how we insert the item as the first child: supply a NULL hInsertAfter
+    if (tvIns.hInsertAfter == (HTREEITEM) 0)
+    {
+        tvIns.hInsertAfter = TVI_FIRST;
+    }
+
+    UINT mask = 0;
+    if ( !text.IsEmpty() )
+    {
+        mask |= TVIF_TEXT;
+        tvIns.item.pszText = (char *)text.c_str();  // cast is ok
+    }
+
+    if ( image != -1 )
+    {
+        mask |= TVIF_IMAGE;
+        tvIns.item.iImage = image;
+
+        if ( selectedImage == -1 )
+        {
+            // take the same image for selected icon if not specified
+            selectedImage = image;
+        }
+    }
 
 
-  info.m_mask = wxTREE_MASK_DATA ;
-  info.m_itemId = item;
-  info.m_data = data;
+    if ( selectedImage != -1 )
+    {
+        mask |= TVIF_SELECTEDIMAGE;
+        tvIns.item.iSelectedImage = selectedImage;
+    }
+
+    if ( data != NULL )
+    {
+        mask |= TVIF_PARAM;
+        tvIns.item.lParam = (LPARAM)data;
+    }
+
+    tvIns.item.mask = mask;
+
+    HTREEITEM id = (HTREEITEM) TreeView_InsertItem(wxhWnd, &tvIns);
+    if ( id == 0 )
+    {
+        wxLogLastError("TreeView_InsertItem");
+    }
 
 
-  return SetItem(info);
+    if ( data != NULL )
+    {
+        // associate the application tree item with Win32 tree item handle
+        data->SetId((WXHTREEITEM)id);
+    }
+
+    return wxTreeItemId((WXHTREEITEM)id);
 }
 
 }
 
-bool wxTreeCtrl::GetItemRect(const long item, wxRectangle& rect, bool textOnly) const
+// for compatibility only
+wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
+                                    const wxString& text,
+                                    int image, int selImage,
+                                    long insertAfter)
 {
 {
-  RECT rect2;
+    return DoInsertItem(parent, (WXHTREEITEM)insertAfter, text,
+                        image, selImage, NULL);
+}
 
 
-  *(HTREEITEM*)& rect2 = (HTREEITEM) item;
-  bool success = (::SendMessage((HWND) GetHWND(), TVM_GETITEMRECT, (WPARAM)textOnly,
-    (LPARAM)&rect2) != 0);
+wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
+                                 int image, int selectedImage,
+                                 wxTreeItemData *data)
+{
+    return DoInsertItem(wxTreeItemId((WXHTREEITEM) 0), (WXHTREEITEM) 0,
+                        text, image, selectedImage, data);
+}
 
 
-  rect.x = rect2.left;
-  rect.y = rect2.top;
-  rect.width = rect2.right - rect2.left;
-  rect.height = rect2.bottom - rect2.left;
-  return success;
+wxTreeItemId wxTreeCtrl::PrependItem(const wxTreeItemId& parent,
+                                     const wxString& text,
+                                     int image, int selectedImage,
+                                     wxTreeItemData *data)
+{
+    return DoInsertItem(parent, (WXHTREEITEM) TVI_FIRST,
+                        text, image, selectedImage, data);
 }
 
 }
 
-wxTextCtrl& wxTreeCtrl::GetEditControl(void) const
+wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
+                                    const wxTreeItemId& idPrevious,
+                                    const wxString& text,
+                                    int image, int selectedImage,
+                                    wxTreeItemData *data)
 {
 {
-  HWND hWnd = (HWND) TreeView_GetEditControl((HWND) GetHWND());
-  ((wxTreeCtrl *)this)->m_textCtrl.SetHWND((WXHWND) hWnd);
-  return (wxTextCtrl&) m_textCtrl;
+    return DoInsertItem(parent, idPrevious, text, image, selectedImage, data);
 }
 
 }
 
-// Operations
-bool wxTreeCtrl::DeleteItem(const long item)
+wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent,
+                                    const wxString& text,
+                                    int image, int selectedImage,
+                                    wxTreeItemData *data)
 {
 {
-  return (TreeView_DeleteItem((HWND) GetHWND(), (HTREEITEM) item) != 0);
+    return DoInsertItem(parent, (WXHTREEITEM) TVI_LAST,
+                        text, image, selectedImage, data);
 }
 
 }
 
-bool wxTreeCtrl::ExpandItem(const long item, const int action)
+void wxTreeCtrl::Delete(const wxTreeItemId& item)
 {
 {
-  UINT mswAction = TVE_EXPAND;
-  switch ( action )
-  {
-    case wxTREE_EXPAND_EXPAND:
-      mswAction = TVE_EXPAND;
-      break;
-    case wxTREE_EXPAND_COLLAPSE:
-      mswAction = TVE_COLLAPSE;
-    case wxTREE_EXPAND_COLLAPSE_RESET:
-      mswAction = TVE_COLLAPSERESET;
-    case wxTREE_EXPAND_TOGGLE:
-      mswAction = TVE_TOGGLE;
-      break;
-    default :
-      break;
-  }
-  return (TreeView_Expand((HWND) GetHWND(), (HTREEITEM) item, mswAction) != 0);
+    if ( !TreeView_DeleteItem(wxhWnd, (HTREEITEM)(WXHTREEITEM)item) )
+    {
+        wxLogLastError("TreeView_DeleteItem");
+    }
 }
 
 }
 
-long wxTreeCtrl::InsertItem(const long parent, wxTreeItem& info, const long insertAfter)
+// delete all children (but don't delete the item itself)
+void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
 {
 {
-  TV_INSERTSTRUCT tvInsertStruct;
-  tvInsertStruct.hParent = (HTREEITEM) parent ;
-  tvInsertStruct.hInsertAfter = (HTREEITEM) insertAfter ;
+    long cookie;
 
 
-  wxConvertToMSWTreeItem(info, tvInsertStruct.item);
+    wxArrayLong children;
+    wxTreeItemId child = GetFirstChild(item, cookie);
+    while ( child.IsOk() )
+    {
+        children.Add((long)(WXHTREEITEM)child);
+
+        child = GetNextChild(item, cookie);
+    }
 
 
-  return (long) TreeView_InsertItem((HWND) GetHWND(), & tvInsertStruct);
+    size_t nCount = children.Count();
+    for ( size_t n = 0; n < nCount; n++ )
+    {
+        if ( !TreeView_DeleteItem(wxhWnd, (HTREEITEM)children[n]) )
+        {
+            wxLogLastError("TreeView_DeleteItem");
+        }
+    }
 }
 
 }
 
-long wxTreeCtrl::InsertItem(const long parent, const wxString& label, const int image, const int selImage,
-  const long insertAfter)
+void wxTreeCtrl::DeleteAllItems()
 {
 {
-  wxTreeItem info;
-  info.m_text = label;
-  info.m_mask = wxTREE_MASK_TEXT;
-  if ( image > -1 )
-  {
-    info.m_mask |= wxTREE_MASK_IMAGE | wxTREE_MASK_SELECTED_IMAGE;
-    info.m_image = image;
-    if ( selImage == -1 )
-      info.m_selectedImage = image;
-    else
-      info.m_selectedImage = selImage;
-  }
+    if ( !TreeView_DeleteAllItems(wxhWnd) )
+    {
+        wxLogLastError("TreeView_DeleteAllItems");
+    }
+}
 
 
-  return InsertItem(parent, info, insertAfter);
+void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
+{
+    wxASSERT_MSG( flag == TVE_COLLAPSE ||
+                  flag == (TVE_COLLAPSE | TVE_COLLAPSERESET) ||
+                  flag == TVE_EXPAND   ||
+                  flag == TVE_TOGGLE,
+                  "Unknown flag in wxTreeCtrl::DoExpand" );
+
+    // TreeView_Expand doesn't send TVN_ITEMEXPAND(ING) messages, so we must
+    // emulate them
+    if ( TreeView_Expand(wxhWnd, (HTREEITEM) (WXHTREEITEM) item, flag) != 0 )
+    {
+        wxTreeEvent event(wxEVT_NULL, m_windowId);
+        event.m_item = item;
+
+        bool isExpanded = IsExpanded(item);
+
+        event.SetEventObject(this);
+
+        // @@@ return values of {EXPAND|COLLAPS}ING event handler is discarded
+        event.SetEventType(g_events[isExpanded][TRUE]);
+        GetEventHandler()->ProcessEvent(event);
+
+        event.SetEventType(g_events[isExpanded][FALSE]);
+        GetEventHandler()->ProcessEvent(event);
+    }
+    else
+    {
+        // I wonder if it really ever happens...
+        wxLogDebug("TreeView_Expand: change didn't took place.");
+    }
 }
 
 }
 
-bool wxTreeCtrl::SelectItem(const long item)
+void wxTreeCtrl::Expand(const wxTreeItemId& item)
 {
 {
-  return (TreeView_SelectItem((HWND) GetHWND(), (HTREEITEM) item) != 0);
+    DoExpand(item, TVE_EXPAND);
 }
 
 }
 
-bool wxTreeCtrl::ScrollTo(const long item)
+void wxTreeCtrl::Collapse(const wxTreeItemId& item)
 {
 {
-  return (TreeView_SelectSetFirstVisible((HWND) GetHWND(), (HTREEITEM) item) != 0);
+    DoExpand(item, TVE_COLLAPSE);
 }
 
 }
 
-bool wxTreeCtrl::DeleteAllItems(void)
+void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item)
 {
 {
-  return (TreeView_DeleteAllItems((HWND) GetHWND()) != 0);
+    DoExpand(item, TVE_COLLAPSE | TVE_COLLAPSERESET);
 }
 
 }
 
-wxTextCtrl& wxTreeCtrl::Edit(const long item)
+void wxTreeCtrl::Toggle(const wxTreeItemId& item)
 {
 {
-  HWND hWnd = (HWND) TreeView_EditLabel((HWND) GetHWND(), item);
-  m_textCtrl.SetHWND((WXHWND) hWnd);
-  return m_textCtrl;
+    DoExpand(item, TVE_TOGGLE);
 }
 
 }
 
-long wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
+void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
 {
 {
-    TV_HITTESTINFO hitTestInfo;
-  hitTestInfo.pt.x = (int) point.x;
-  hitTestInfo.pt.y = (int) point.y;
+       DoExpand(item, action);
+}
 
 
-    TreeView_HitTest((HWND) GetHWND(), & hitTestInfo);
+void wxTreeCtrl::Unselect()
+{
+    SelectItem(wxTreeItemId((WXHTREEITEM) 0));
+}
 
 
-  flags = 0;
-  if ( hitTestInfo.flags & TVHT_ABOVE )
-    flags |= wxTREE_HITTEST_ABOVE;
-  if ( hitTestInfo.flags & TVHT_BELOW )
-    flags |= wxTREE_HITTEST_BELOW;
-  if ( hitTestInfo.flags & TVHT_NOWHERE )
-    flags |= wxTREE_HITTEST_NOWHERE;
-  if ( hitTestInfo.flags & TVHT_ONITEMBUTTON )
-    flags |= wxTREE_HITTEST_ONITEMBUTTON;
-  if ( hitTestInfo.flags & TVHT_ONITEMICON )
-    flags |= wxTREE_HITTEST_ONITEMICON;
-  if ( hitTestInfo.flags & TVHT_ONITEMINDENT )
-    flags |= wxTREE_HITTEST_ONITEMINDENT;
-  if ( hitTestInfo.flags & TVHT_ONITEMLABEL )
-    flags |= wxTREE_HITTEST_ONITEMLABEL;
-  if ( hitTestInfo.flags & TVHT_ONITEMRIGHT )
-    flags |= wxTREE_HITTEST_ONITEMRIGHT;
-  if ( hitTestInfo.flags & TVHT_ONITEMSTATEICON )
-    flags |= wxTREE_HITTEST_ONITEMSTATEICON;
-  if ( hitTestInfo.flags & TVHT_TOLEFT )
-    flags |= wxTREE_HITTEST_TOLEFT;
-  if ( hitTestInfo.flags & TVHT_TORIGHT )
-    flags |= wxTREE_HITTEST_TORIGHT;
+void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
+{
+    if ( !TreeView_SelectItem(wxhWnd, (HTREEITEM) (WXHTREEITEM) item) )
+    {
+        wxLogLastError("TreeView_SelectItem");
+    }
+}
 
 
-  return (long) hitTestInfo.hItem ;
+void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
+{
+    // no error return
+    TreeView_EnsureVisible(wxhWnd, (HTREEITEM) (WXHTREEITEM) item);
 }
 
 }
 
-/*
-wxImageList *wxTreeCtrl::CreateDragImage(const long item)
+void wxTreeCtrl::ScrollTo(const wxTreeItemId& item)
 {
 {
+    if ( !TreeView_SelectSetFirstVisible(wxhWnd, (HTREEITEM) (WXHTREEITEM) item) )
+    {
+        wxLogLastError("TreeView_SelectSetFirstVisible");
+    }
 }
 }
-*/
 
 
-bool wxTreeCtrl::SortChildren(const long item)
+wxTextCtrl* wxTreeCtrl::GetEditControl() const
 {
 {
-  return (TreeView_SortChildren((HWND) GetHWND(), (HTREEITEM) item, 0) != 0);
+    return m_textCtrl;
 }
 
 }
 
-bool wxTreeCtrl::EnsureVisible(const long item)
+void wxTreeCtrl::DeleteTextCtrl()
 {
 {
-  return (TreeView_EnsureVisible((HWND) GetHWND(), (HTREEITEM) item) != 0);
+    if ( m_textCtrl )
+    {
+        m_textCtrl->UnsubclassWin();
+        m_textCtrl->SetHWND(0);
+        delete m_textCtrl;
+        m_textCtrl = NULL;
+    }
 }
 
 }
 
-bool wxTreeCtrl::MSWCommand(const WXUINT cmd, const WXWORD id)
+wxTextCtrl* wxTreeCtrl::EditLabel(const wxTreeItemId& item,
+                                  wxClassInfo* textControlClass)
 {
 {
-  if (cmd == EN_UPDATE)
-  {
-    wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, id);
-    event.SetEventObject( this );
-    ProcessCommand(event);
-    return TRUE;
-  }
-  else if (cmd == EN_KILLFOCUS)
-  {
-    wxCommandEvent event(wxEVT_KILL_FOCUS, id);
-    event.SetEventObject( this );
-    ProcessCommand(event);
-    return TRUE;
-  }
-  else return FALSE;
-}
-
-bool wxTreeCtrl::MSWNotify(const WXWPARAM wParam, const WXLPARAM lParam)
-{
-  wxTreeEvent event(wxEVT_NULL, m_windowId);
-  wxEventType eventType = wxEVT_NULL;
-  NMHDR* hdr1 = (NMHDR*) lParam;
-  switch ( hdr1->code )
-  {
-    case TVN_BEGINDRAG:
-    {
-      eventType = wxEVT_COMMAND_TREE_BEGIN_DRAG;
-      NM_TREEVIEW* hdr = (NM_TREEVIEW*)lParam;
-      wxConvertFromMSWTreeItem(event.m_item, hdr->itemNew, (HWND) GetHWND());
-      event.m_pointDrag.x = hdr->ptDrag.x;
-      event.m_pointDrag.y = hdr->ptDrag.y;
-      break;
-    }
-    case TVN_BEGINLABELEDIT:
-    {
-      eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
-      TV_DISPINFO *info = (TV_DISPINFO *)lParam;
-      wxConvertFromMSWTreeItem(event.m_item, info->item, (HWND) GetHWND());
-      break;
-    }
-    case TVN_BEGINRDRAG:
-    {
-      eventType = wxEVT_COMMAND_TREE_BEGIN_RDRAG;
-      NM_TREEVIEW* hdr = (NM_TREEVIEW*)lParam;
-      wxConvertFromMSWTreeItem(event.m_item, hdr->itemNew, (HWND) GetHWND());
-      event.m_pointDrag.x = hdr->ptDrag.x;
-      event.m_pointDrag.y = hdr->ptDrag.y;
-      break;
-    }
-    case TVN_DELETEITEM:
-    {
-      eventType = wxEVT_COMMAND_TREE_DELETE_ITEM;
-      NM_TREEVIEW* hdr = (NM_TREEVIEW*)lParam;
-      wxConvertFromMSWTreeItem(event.m_item, hdr->itemOld, (HWND) GetHWND());
-      event.m_pointDrag.x = hdr->ptDrag.x;
-      event.m_pointDrag.y = hdr->ptDrag.y;
-      break;
-    }
-    case TVN_ENDLABELEDIT:
-    {
-      eventType = wxEVT_COMMAND_TREE_END_LABEL_EDIT;
-      TV_DISPINFO *info = (TV_DISPINFO *)lParam;
-      wxConvertFromMSWTreeItem(event.m_item, info->item, (HWND) GetHWND());
-      break;
-    }
-    case TVN_GETDISPINFO:
-    {
-      eventType = wxEVT_COMMAND_TREE_GET_INFO;
-      TV_DISPINFO *info = (TV_DISPINFO *)lParam;
-      wxConvertFromMSWTreeItem(event.m_item, info->item, (HWND) GetHWND());
-      break;
-    }
-    case TVN_ITEMEXPANDING:
-    {
-      eventType = wxEVT_COMMAND_TREE_ITEM_EXPANDING;
-      NM_TREEVIEW* hdr = (NM_TREEVIEW*)lParam;
-      wxConvertFromMSWTreeItem(event.m_item, hdr->itemNew, (HWND) GetHWND());
-
-      switch ( hdr->action )
-      {
-        case TVE_EXPAND:
-          event.m_code = wxTREE_EXPAND_EXPAND;
-          break;
-        case TVE_COLLAPSE:
-          event.m_code = wxTREE_EXPAND_COLLAPSE;
-        case TVE_COLLAPSERESET:
-          event.m_code = wxTREE_EXPAND_COLLAPSE_RESET;
-        case TVE_TOGGLE:
-          event.m_code = wxTREE_EXPAND_TOGGLE;
-          break;
-        default :
-          break;
-      }
-      break;
-    }
-    case TVN_ITEMEXPANDED:
-    {
-      eventType = wxEVT_COMMAND_TREE_ITEM_EXPANDED;
-      NM_TREEVIEW* hdr = (NM_TREEVIEW*)lParam;
-      wxConvertFromMSWTreeItem(event.m_item, hdr->itemNew, (HWND) GetHWND());
-      switch ( hdr->action )
-      {
-        case TVE_EXPAND:
-          event.m_code = wxTREE_EXPAND_EXPAND;
-          break;
-        case TVE_COLLAPSE:
-          event.m_code = wxTREE_EXPAND_COLLAPSE;
-        case TVE_COLLAPSERESET:
-          event.m_code = wxTREE_EXPAND_COLLAPSE_RESET;
-        case TVE_TOGGLE:
-          event.m_code = wxTREE_EXPAND_TOGGLE;
-          break;
-        default :
-          break;
-      }
-      break;
-    }
-    case TVN_KEYDOWN:
-    {
-      eventType = wxEVT_COMMAND_TREE_KEY_DOWN;
-      TV_KEYDOWN *info = (TV_KEYDOWN *)lParam;
-      event.m_code = wxCharCodeMSWToWX(info->wVKey);
-      break;
-    }
-    case TVN_SELCHANGED:
-    {
-      eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;
-      NM_TREEVIEW* hdr = (NM_TREEVIEW*)lParam;
-      wxConvertFromMSWTreeItem(event.m_item, hdr->itemNew, (HWND) GetHWND());
-      event.m_oldItem = (long) hdr->itemNew.hItem;
-
-      break;
-    }
-    case TVN_SELCHANGING:
-    {
-      eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
-      NM_TREEVIEW* hdr = (NM_TREEVIEW*)lParam;
-      wxConvertFromMSWTreeItem(event.m_item, hdr->itemNew, (HWND) GetHWND());
-      event.m_oldItem = (long) hdr->itemNew.hItem;
-      break;
-    }
-    case TVN_SETDISPINFO:
-    {
-      eventType = wxEVT_COMMAND_TREE_SET_INFO;
-      TV_DISPINFO *info = (TV_DISPINFO *)lParam;
-      wxConvertFromMSWTreeItem(event.m_item, info->item, (HWND) GetHWND());
-      break;
-    }
-
-    default :
-      return wxControl::MSWNotify(wParam, lParam);
-      break;
-  }
-
-  event.SetEventObject( this );
-  event.SetEventType(eventType);
-
-  if ( !GetEventHandler()->ProcessEvent(event) )
-    return FALSE;
-
-  if (hdr1->code == TVN_GETDISPINFO)
-  {
-    TV_DISPINFO *info = (TV_DISPINFO *)lParam;
-    wxConvertToMSWTreeItem(event.m_item, info->item);
-  }
+    wxASSERT( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)) );
 
 
-    return TRUE;
+    HWND hWnd = (HWND) TreeView_EditLabel(wxhWnd, (HTREEITEM) (WXHTREEITEM) item);
+
+    wxCHECK_MSG( hWnd, NULL, "Can't edit tree ctrl label" );
+
+    DeleteTextCtrl();
+
+    m_textCtrl = (wxTextCtrl *)textControlClass->CreateObject();
+    m_textCtrl->SetHWND((WXHWND)hWnd);
+    m_textCtrl->SubclassWin((WXHWND)hWnd);
+
+    return m_textCtrl;
 }
 
 }
 
-// Tree item structure
-wxTreeItem::wxTreeItem(void)
+// End label editing, optionally cancelling the edit
+void wxTreeCtrl::EndEditLabel(const wxTreeItemId& item, bool discardChanges)
 {
 {
-    m_mask = 0;
-    m_itemId = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = -1;
-    m_selectedImage = -1;
-    m_children = 0;
-  m_data = 0;
+    TreeView_EndEditLabelNow(wxhWnd, discardChanges);
+
+    DeleteTextCtrl();
 }
 
 }
 
-// If getFullInfo is TRUE, we explicitly query for more info if we haven't got it all.
-static void wxConvertFromMSWTreeItem(wxTreeItem& info, TV_ITEM& tvItem, HWND getFullInfo)
+wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
 {
 {
-  info.m_data = tvItem.lParam;
-  info.m_mask = 0;
-  info.m_state = 0;
-  info.m_stateMask = 0;
+    TV_HITTESTINFO hitTestInfo;
+    hitTestInfo.pt.x = (int)point.x;
+    hitTestInfo.pt.y = (int)point.y;
+
+    TreeView_HitTest(wxhWnd, &hitTestInfo);
+
+    flags = 0;
+
+    // avoid repetition
+    #define TRANSLATE_FLAG(flag) if ( hitTestInfo.flags & TVHT_##flag ) \
+                                    flags |= wxTREE_HITTEST_##flag
 
 
-  long oldMask = tvItem.mask;
+    TRANSLATE_FLAG(ABOVE);
+    TRANSLATE_FLAG(BELOW);
+    TRANSLATE_FLAG(NOWHERE);
+    TRANSLATE_FLAG(ONITEMBUTTON);
+    TRANSLATE_FLAG(ONITEMICON);
+    TRANSLATE_FLAG(ONITEMINDENT);
+    TRANSLATE_FLAG(ONITEMLABEL);
+    TRANSLATE_FLAG(ONITEMRIGHT);
+    TRANSLATE_FLAG(ONITEMSTATEICON);
+    TRANSLATE_FLAG(TOLEFT);
+    TRANSLATE_FLAG(TORIGHT);
 
 
-  bool needText = FALSE;
-  if (getFullInfo != 0)
-  {
-    if ( tvItem.mask & TVIF_TEXT )
-      needText = FALSE;
+    #undef TRANSLATE_FLAG
+
+    return wxTreeItemId((WXHTREEITEM) hitTestInfo.hItem);
+}
+
+bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
+                                 wxRect& rect,
+                                 bool textOnly) const
+{
+    RECT rc;
+    if ( TreeView_GetItemRect(wxhWnd, (HTREEITEM)(WXHTREEITEM)item,
+                              &rc, textOnly) )
+    {
+        rect = wxRect(wxPoint(rc.left, rc.top), wxPoint(rc.right, rc.bottom));
+
+        return TRUE;
+    }
     else
     else
-      needText = TRUE;
+    {
+        // couldn't retrieve rect: for example, item isn't visible
+        return FALSE;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// sorting stuff
+// ----------------------------------------------------------------------------
+
+static int CALLBACK TreeView_CompareCallback(wxTreeItemData *pItem1,
+                                             wxTreeItemData *pItem2,
+                                             wxTreeCtrl *tree)
+{
+    wxCHECK_MSG( pItem1 && pItem2, 0,
+                 _T("sorting tree without data doesn't make sense") );
+
+    return tree->OnCompareItems(pItem1->GetId(), pItem2->GetId());
+}
+
+int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
+                               const wxTreeItemId& item2)
+{
+    return strcmp(GetItemText(item1), GetItemText(item2));
+}
 
 
-    if ( needText )
+void wxTreeCtrl::SortChildren(const wxTreeItemId& 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!)
+    if ( GetClassInfo() == CLASSINFO(wxTreeCtrl) )
     {
     {
-      tvItem.pszText = new char[513];
-      tvItem.cchTextMax = 512;
+        TreeView_SortChildren(wxhWnd, (HTREEITEM)(WXHTREEITEM)item, 0);
     }
     }
-    tvItem.mask |= TVIF_HANDLE | TVIF_STATE | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM ;
-    ::SendMessage(getFullInfo, TVM_GETITEM, 0, (LPARAM)& tvItem) ;
-  }
+    else
+    {
+        TV_SORTCB tvSort;
+        tvSort.hParent = (HTREEITEM)(WXHTREEITEM)item;
+        tvSort.lpfnCompare = (PFNTVCOMPARE)TreeView_CompareCallback;
+        tvSort.lParam = (LPARAM)this;
+        TreeView_SortChildrenCB(wxhWnd, &tvSort, 0 /* reserved */);
+    }
+}
 
 
-  if ( tvItem.mask & TVIF_HANDLE )
-  {
-    info.m_mask |= wxTREE_MASK_HANDLE;
-    info.m_itemId = (long) tvItem.hItem;
-  }
-  if ( tvItem.mask & TVIF_STATE )
-  {
-    info.m_mask |= wxTREE_MASK_STATE;
-      if ( tvItem.stateMask & TVIS_BOLD)
-    {
-      info.m_stateMask |= wxTREE_STATE_BOLD ;
-      if ( tvItem.state & TVIS_BOLD )
-        info.m_state |= wxTREE_STATE_BOLD ;
-    }
-
-      if ( tvItem.stateMask & TVIS_CUT)
-    {
-      info.m_stateMask |= wxTREE_STATE_CUT ;
-      if ( tvItem.state & TVIS_CUT )
-        info.m_state |= wxTREE_STATE_CUT ;
-    }
-
-      if ( tvItem.stateMask & TVIS_DROPHILITED)
-    {
-      info.m_stateMask |= wxTREE_STATE_DROPHILITED ;
-      if ( tvItem.state & TVIS_DROPHILITED )
-        info.m_state |= wxTREE_STATE_DROPHILITED ;
-    }
-      if ( tvItem.stateMask & TVIS_EXPANDED)
-    {
-      info.m_stateMask |= wxTREE_STATE_EXPANDED ;
-      if ( tvItem.state & TVIS_EXPANDED )
-        info.m_state |= wxTREE_STATE_EXPANDED ;
-    }
-      if ( tvItem.stateMask & TVIS_EXPANDEDONCE)
-    {
-      info.m_stateMask |= wxTREE_STATE_EXPANDEDONCE ;
-      if ( tvItem.state & TVIS_EXPANDEDONCE )
-        info.m_state |= wxTREE_STATE_EXPANDEDONCE ;
-    }
-      if ( tvItem.stateMask & TVIS_FOCUSED)
-    {
-      info.m_stateMask |= wxTREE_STATE_FOCUSED ;
-      if ( tvItem.state & TVIS_FOCUSED )
-        info.m_state |= wxTREE_STATE_FOCUSED ;
-    }
-      if ( tvItem.stateMask & TVIS_SELECTED)
-    {
-      info.m_stateMask |= wxTREE_STATE_SELECTED ;
-      if ( tvItem.state & TVIS_SELECTED )
-        info.m_state |= wxTREE_STATE_SELECTED ;
-    }
-  }
-
-  if ( tvItem.mask & TVIF_TEXT )
-  {
-    info.m_mask |= wxTREE_MASK_TEXT;
-    info.m_text = tvItem.pszText;
-  }
-  if ( tvItem.mask & TVIF_IMAGE )
-  {
-    info.m_mask |= wxTREE_MASK_IMAGE;
-    info.m_image = tvItem.iImage;
-  }
-  if ( tvItem.mask & TVIF_SELECTEDIMAGE )
-  {
-    info.m_mask |= wxTREE_MASK_SELECTED_IMAGE;
-    info.m_selectedImage = tvItem.iSelectedImage;
-  }
-  if ( tvItem.mask & TVIF_CHILDREN )
-  {
-    info.m_mask |= wxTREE_MASK_CHILDREN;
-    info.m_children = tvItem.cChildren;
-  }
-  if ( tvItem.mask & TVIF_PARAM )
-    info.m_mask |= wxTREE_MASK_DATA;
-
-  if (needText)
-  {
-        if (tvItem.pszText)
-      delete[] tvItem.pszText;
-  }
-  tvItem.mask = oldMask ;
-}
-
-static void wxConvertToMSWTreeItem(wxTreeItem& info, TV_ITEM& tvItem)
-{
-  tvItem.hItem = (HTREEITEM) info.m_itemId ;
-
-  tvItem.iImage = info.m_image ;
-  tvItem.iSelectedImage = info.m_selectedImage;
-  tvItem.cChildren = info.m_children;
-  tvItem.lParam = info.m_data;
-  tvItem.mask = 0;
-  tvItem.stateMask = 0;
-  tvItem.state = 0;
-
-  if (info.m_mask & wxTREE_MASK_HANDLE)
-    tvItem.mask |= TVIF_HANDLE ;
-  if (info.m_mask & wxTREE_MASK_STATE)
-    tvItem.mask |= TVIF_STATE ;
-  if (info.m_mask & wxTREE_MASK_TEXT)
-  {
-    tvItem.mask |= TVIF_TEXT ;
-    tvItem.pszText = (char *) (const char *)info.m_text ;
-    if ( tvItem.pszText )
-      tvItem.cchTextMax = info.m_text.Length();
+// ----------------------------------------------------------------------------
+// implementation
+// ----------------------------------------------------------------------------
+
+bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id)
+{
+    if ( cmd == EN_UPDATE )
+    {
+        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, id);
+        event.SetEventObject( this );
+        ProcessCommand(event);
+    }
+    else if ( cmd == EN_KILLFOCUS )
+    {
+        wxCommandEvent event(wxEVT_KILL_FOCUS, id);
+        event.SetEventObject( this );
+        ProcessCommand(event);
+    }
     else
     else
-      tvItem.cchTextMax = 0;
-  }
-  if (info.m_mask & wxTREE_MASK_IMAGE)
-    tvItem.mask |= TVIF_IMAGE ;
-  if (info.m_mask & wxTREE_MASK_SELECTED_IMAGE)
-    tvItem.mask |= TVIF_SELECTEDIMAGE ;
-  if (info.m_mask & wxTREE_MASK_CHILDREN)
-    tvItem.mask |= TVIF_CHILDREN ;
-  if (info.m_mask & wxTREE_MASK_DATA)
-    tvItem.mask |= TVIF_PARAM ;
-
-  if (info.m_stateMask & wxTREE_STATE_BOLD)
-  {
-      tvItem.stateMask |= TVIS_BOLD ;
-    tvItem.state |= TVIS_BOLD;
-  }
-  if (info.m_stateMask & wxTREE_STATE_CUT)
-  {
-      tvItem.stateMask |= TVIS_CUT ;
-    if ( info.m_state & wxTREE_STATE_CUT )
-      tvItem.state |= TVIS_CUT;
-  }
-  if (info.m_stateMask & wxTREE_STATE_DROPHILITED)
-  {
-      tvItem.stateMask |= TVIS_DROPHILITED;
-    if ( info.m_state & wxTREE_STATE_DROPHILITED )
-        tvItem.state |= TVIS_DROPHILITED;
-  }
-  if (info.m_stateMask & wxTREE_STATE_EXPANDED)
-  {
-      tvItem.stateMask |= TVIS_EXPANDED;
-    if ( info.m_state & wxTREE_STATE_EXPANDED )
-        tvItem.state |= TVIS_EXPANDED;
-  }
-  if (info.m_stateMask & wxTREE_STATE_EXPANDEDONCE)
-  {
-      tvItem.stateMask |= TVIS_EXPANDEDONCE;
-    if ( info.m_state & wxTREE_STATE_EXPANDEDONCE )
-        tvItem.state |= TVIS_EXPANDEDONCE;
-  }
-  if (info.m_stateMask & wxTREE_STATE_FOCUSED)
-  {
-      tvItem.stateMask |= TVIS_FOCUSED;
-    if ( info.m_state & wxTREE_STATE_FOCUSED )
-        tvItem.state |= TVIS_FOCUSED;
-  }
-  if (info.m_stateMask & wxTREE_STATE_SELECTED)
-  {
-      tvItem.stateMask |= TVIS_SELECTED;
-    if ( info.m_state & wxTREE_STATE_SELECTED )
-        tvItem.state |= TVIS_SELECTED;
-  }
+    {
+        // nothing done
+        return FALSE;
+    }
+
+    // command processed
+    return TRUE;
 }
 
 }
 
+// process WM_NOTIFY Windows message
+bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
+{
+    wxTreeEvent event(wxEVT_NULL, m_windowId);
+    wxEventType eventType = wxEVT_NULL;
+    NMHDR *hdr = (NMHDR *)lParam;
+
+    switch ( hdr->code )
+    {
+        case TVN_BEGINDRAG:
+            eventType = wxEVT_COMMAND_TREE_BEGIN_DRAG;
+            // fall through
+
+        case TVN_BEGINRDRAG:
+            {
+                if ( eventType == wxEVT_NULL )
+                    eventType = wxEVT_COMMAND_TREE_BEGIN_RDRAG;
+                //else: left drag, already set above
+
+                NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
+
+                event.m_item = (WXHTREEITEM) tv->itemNew.hItem;
+                event.m_pointDrag = wxPoint(tv->ptDrag.x, tv->ptDrag.y);
+                break;
+            }
+
+        case TVN_BEGINLABELEDIT:
+            {
+                eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
+                TV_DISPINFO *info = (TV_DISPINFO *)lParam;
+
+                event.m_item = (WXHTREEITEM) info->item.hItem;
+                break;
+            }
+
+        case TVN_DELETEITEM:
+            {
+                eventType = wxEVT_COMMAND_TREE_DELETE_ITEM;
+                NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
+
+                event.m_item = (WXHTREEITEM) tv->itemOld.hItem;
+                break;
+            }
+
+        case TVN_ENDLABELEDIT:
+            {
+                eventType = wxEVT_COMMAND_TREE_END_LABEL_EDIT;
+                TV_DISPINFO *info = (TV_DISPINFO *)lParam;
+
+                event.m_item = (WXHTREEITEM) info->item.hItem;
+                break;
+            }
+
+        case TVN_GETDISPINFO:
+            eventType = wxEVT_COMMAND_TREE_GET_INFO;
+            // fall through
+
+        case TVN_SETDISPINFO:
+            {
+                if ( eventType == wxEVT_NULL )
+                    eventType = wxEVT_COMMAND_TREE_SET_INFO;
+                //else: get, already set above
+
+                TV_DISPINFO *info = (TV_DISPINFO *)lParam;
+
+                event.m_item = (WXHTREEITEM) info->item.hItem;
+                break;
+            }
+
+        case TVN_ITEMEXPANDING:
+            event.m_code = FALSE;
+            // fall through
+
+        case TVN_ITEMEXPANDED:
+            {
+                NM_TREEVIEW* tv = (NM_TREEVIEW*)lParam;
+
+                bool expand = FALSE;
+                switch ( tv->action )
+                {
+                    case TVE_EXPAND:
+                        expand = TRUE;
+                        break;
+
+                    case TVE_COLLAPSE:
+                        expand = FALSE;
+                        break;
+
+                    default:
+                        wxLogDebug("unexpected code %d in TVN_ITEMEXPAND "
+                                   "message", tv->action);
+                }
+
+                bool ing = (hdr->code == TVN_ITEMEXPANDING);
+                eventType = g_events[expand][ing];
+
+                event.m_item = (WXHTREEITEM) tv->itemNew.hItem;
+                break;
+            }
+
+        case TVN_KEYDOWN:
+            {
+                eventType = wxEVT_COMMAND_TREE_KEY_DOWN;
+                TV_KEYDOWN *info = (TV_KEYDOWN *)lParam;
+
+                event.m_code = wxCharCodeMSWToWX(info->wVKey);
+
+                // a separate event for this case
+                if ( info->wVKey == VK_SPACE || info->wVKey == VK_RETURN )
+                {
+                    wxTreeEvent event2(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
+                                       m_windowId);
+                    event2.SetEventObject(this);
+
+                    GetEventHandler()->ProcessEvent(event2);
+                }
+                break;
+            }
+
+        case TVN_SELCHANGED:
+            eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;
+            // fall through
+
+        case TVN_SELCHANGING:
+            {
+                if ( eventType == wxEVT_NULL )
+                    eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
+                //else: already set above
+
+                NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam;
+
+                event.m_item = (WXHTREEITEM) tv->itemNew.hItem;
+                event.m_itemOld = (WXHTREEITEM) tv->itemOld.hItem;
+                break;
+            }
+
+        default:
+            return wxControl::MSWOnNotify(idCtrl, lParam, result);
+    }
+
+    event.SetEventObject(this);
+    event.SetEventType(eventType);
+
+    bool processed = GetEventHandler()->ProcessEvent(event);
+
+    // post processing
+    if ( hdr->code == TVN_DELETEITEM )
+    {
+        // NB: we might process this message using wxWindows event tables, but
+        //     due to overhead of wxWin event system we prefer to do it here
+        //     (otherwise deleting a tree with many items is just too slow)
+        NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam;
+        wxTreeItemData *data = (wxTreeItemData *)tv->itemOld.lParam;
+        delete data; // may be NULL, ok
+        processed = TRUE; // Make sure we don't get called twice
+    }
+
+    *result = !event.IsAllowed();
+
+    return processed;
+}
+
+// ----------------------------------------------------------------------------
 // Tree event
 // Tree event
-IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxCommandEvent)
+// ----------------------------------------------------------------------------
+
+IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
 
 
-wxTreeEvent::wxTreeEvent(wxEventType commandType, int id):
-  wxCommandEvent(commandType, id)
+wxTreeEvent::wxTreeEvent(wxEventType commandType, int id)
+           : wxNotifyEvent(commandType, id)
 {
 {
-  m_code = 0;
-  m_oldItem = 0;
+    m_code = 0;
+    m_itemOld = 0;
 }
 
 }
 
-#endif
+#endif // __WIN95__
 
 
wxWidgets (Impactor)