Applied Diana's font patch II

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 647180b31780294d9e47e04bc1a92212969a06cd..44c408406b6d03bb6d221ec415a45200bce43ba4 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -1,927 +1,1609 @@
-/*
- * 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
 
 #endif
 

-#ifndef WX_PRECOMP
-#include "wx.h"
+#include "wx/window.h"
+#include "wx/msw/private.h"
+
+// Mingw32 is a bit mental even though this is done in winundef
+#ifdef GetFirstChild
+    #undef GetFirstChild

 #endif
 
 #endif
 

-#include "wx/log.h"
+#ifdef GetNextSibling
+    #undef GetNextSibling
+#endif

 
 #if defined(__WIN95__)
 
 
 #if defined(__WIN95__)
 

+#include "wx/log.h"
+#include "wx/dynarray.h"
+#include "wx/imaglist.h"

 #include "wx/treectrl.h"
 #include "wx/treectrl.h"

-#include "wx/msw/private.h"
+#include "wx/settings.h"
+
+#ifdef __GNUWIN32__
+#ifndef wxUSE_NORLANDER_HEADERS
+#include "wx/msw/gnuwin32/extra.h"
+#endif
+#endif

 
 

-#ifndef __GNUWIN32__
-#include <commctrl.h>
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)
+    #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
+// ----------------------------------------------------------------------------
+
+// a convenient wrapper around TV_ITEM struct which adds a ctor
+#ifdef __VISUALC__
+#pragma warning( disable : 4097 )
+#endif
+
+struct wxTreeViewItem : public TV_ITEM
+{
+    wxTreeViewItem(const wxTreeItemId& item,    // the item handle
+                   UINT mask_,                  // fields which are valid
+                   UINT stateMask_ = 0)         // for TVIF_STATE only
+    {
+        // hItem member is always valid
+        mask = mask_ | TVIF_HANDLE;
+        stateMask = stateMask_;
+        hItem = (HTREEITEM) (WXHTREEITEM) item;
+    }
+};
+
+#ifdef __VISUALC__
+#pragma warning( default : 4097 )
+#endif
+
+// a class which encapsulates the tree traversal logic: it vists all (unless
+// OnVisit() returns FALSE) items under the given one
+class wxTreeTraversal
+{
+public:
+    wxTreeTraversal(const wxTreeCtrl *tree)
+    {
+        m_tree = tree;
+    }
+
+    // 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
+    bool DoTraverse(const wxTreeItemId& root, bool recursively = TRUE);
+
+    // override this function to do whatever is needed for each item, return
+    // FALSE to stop traversing
+    virtual bool OnVisit(const wxTreeItemId& item) = 0;
+
+protected:
+    const wxTreeCtrl *GetTree() const { return m_tree; }
+
+private:
+    bool Traverse(const wxTreeItemId& root, bool recursively);
+
+    const wxTreeCtrl *m_tree;
+};
+
+// internal class for getting the selected items
+class TraverseSelections : public wxTreeTraversal
+{
+public:
+    TraverseSelections(const wxTreeCtrl *tree,
+                       wxArrayTreeItemIds& selections)
+        : wxTreeTraversal(tree), m_selections(selections)
+        {
+            m_selections.Empty();
+
+            DoTraverse(tree->GetRootItem());
+        }
+
+    virtual bool OnVisit(const wxTreeItemId& item)
+    {
+        if ( GetTree()->IsItemChecked(item) )
+        {
+            m_selections.Add(item);
+        }
+
+        return TRUE;
+    }
+
+private:
+    wxArrayTreeItemIds& m_selections;
+};
+
+// internal class for counting tree items
+class TraverseCounter : public wxTreeTraversal
+{
+public:
+    TraverseCounter(const wxTreeCtrl *tree,
+                    const wxTreeItemId& root,
+                    bool recursively)
+        : wxTreeTraversal(tree)
+        {
+            m_count = 0;
+
+            DoTraverse(root, recursively);
+        }
+
+    virtual bool OnVisit(const wxTreeItemId& item)
+    {
+        m_count++;
+
+        return TRUE;
+    }
+
+    size_t GetCount() const { return m_count; }
+
+private:
+    size_t m_count;
+};
+
+// ----------------------------------------------------------------------------
+// This class is needed for support of different images: the Win32 common
+// control natively supports only 2 images (the normal one and another for the
+// selected state). We wish to provide support for 2 more of them for folder
+// items (i.e. those which have children): for expanded state and for expanded
+// selected state. For this we use this structure to store the additional items
+// images.
+//
+// There is only one problem with this: when we retrieve the item's data, we
+// don't know whether we get a pointer to wxTreeItemData or
+// wxTreeItemIndirectData. So we have to maintain a list of all items which
+// have indirect data inside the listctrl itself.
+// ----------------------------------------------------------------------------
+class wxTreeItemIndirectData
+{
+public:
+    // ctor associates this data with the item and the real item data becomes
+    // available through our GetData() method
+    wxTreeItemIndirectData(wxTreeCtrl *tree, const wxTreeItemId& item)
+    {
+        for ( size_t n = 0; n < WXSIZEOF(m_images); n++ )
+        {
+            m_images[n] = -1;
+        }
+
+        // save the old data
+        m_data = tree->GetItemData(item);
+
+        // and set ourselves as the new one
+        tree->SetIndirectItemData(item, this);
+    }
+
+    // dtor deletes the associated data as well
+    ~wxTreeItemIndirectData() { delete m_data; }
+
+    // accessors
+        // get the real data associated with the item
+    wxTreeItemData *GetData() const { return m_data; }
+        // change it
+    void SetData(wxTreeItemData *data) { m_data = data; }
+
+        // do we have such image?
+    bool HasImage(wxTreeItemIcon which) const { return m_images[which] != -1; }
+        // get image
+    int GetImage(wxTreeItemIcon which) const { return m_images[which]; }
+        // change it
+    void SetImage(int image, wxTreeItemIcon which) { m_images[which] = image; }
+
+private:
+    // all the images associated with the item
+    int m_images[wxTreeItemIcon_Max];
+
+    wxTreeItemData *m_data;
+};
+
+// ----------------------------------------------------------------------------
+// macros
+// ----------------------------------------------------------------------------

 
 #if !USE_SHARED_LIBRARY
 
 #if !USE_SHARED_LIBRARY

-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
-IMPLEMENT_DYNAMIC_CLASS(wxTreeItem, wxObject)
+    IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
+#endif
+
+// ----------------------------------------------------------------------------
+// variables
+// ----------------------------------------------------------------------------
+
+// handy table for sending events
+static const wxEventType g_events[2][2] =
+{
+    { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxEVT_COMMAND_TREE_ITEM_COLLAPSING },
+    { wxEVT_COMMAND_TREE_ITEM_EXPANDED,  wxEVT_COMMAND_TREE_ITEM_EXPANDING  }
+};
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// tree traversal
+// ----------------------------------------------------------------------------
+
+bool wxTreeTraversal::DoTraverse(const wxTreeItemId& root, bool recursively)
+{
+    if ( !OnVisit(root) )
+        return FALSE;
+
+    return Traverse(root, recursively);
+}
+
+bool wxTreeTraversal::Traverse(const wxTreeItemId& root, bool recursively)
+{
+    long cookie;
+    wxTreeItemId child = m_tree->GetFirstChild(root, cookie);
+    while ( child.IsOk() )
+    {
+        // depth first traversal
+        if ( recursively && !Traverse(child, TRUE) )
+            return FALSE;
+
+        if ( !OnVisit(child) )
+            return FALSE;
+
+        child = m_tree->GetNextChild(root, cookie);
+    }
+
+    return TRUE;
+}
+
+// ----------------------------------------------------------------------------
+// construction and destruction
+// ----------------------------------------------------------------------------
+
+void wxTreeCtrl::Init()
+{
+    m_imageListNormal = NULL;
+    m_imageListState = NULL;
+    m_textCtrl = NULL;
+}
+
+bool wxTreeCtrl::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        long style,
+                        const wxValidator& validator,
+                        const wxString& name)
+{
+    Init();
+
+    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+        return FALSE;
+
+    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
+                   TVS_HASLINES | TVS_SHOWSELALWAYS;
+
+    if ( m_windowStyle & wxTR_HAS_BUTTONS )
+        wstyle |= TVS_HASBUTTONS;
+
+    if ( m_windowStyle & wxTR_EDIT_LABELS )
+        wstyle |= TVS_EDITLABELS;
+
+    if ( m_windowStyle & wxTR_LINES_AT_ROOT )
+        wstyle |= TVS_LINESATROOT;

 
 

+#if !defined( __GNUWIN32__ ) && !defined( __BORLANDC__ ) && !defined(wxUSE_NORLANDER_HEADERS)
+    // we emulate the multiple selection tree controls by using checkboxes: set
+    // up the image list we need for this if we do have multiple selections
+#if !defined(__VISUALC__) || (__VISUALC__ != 1010)
+    if ( m_windowStyle & wxTR_MULTIPLE )
+        wstyle |= TVS_CHECKBOXES;

 #endif
 #endif

+#endif
+
+    // Create the tree control.
+    if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )
+        return FALSE;
+
+    SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW));
+    SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
+
+    // VZ: this is some experimental code which may be used to get the
+    //     TVS_CHECKBOXES style functionality for comctl32.dll < 4.71.
+    //     AFAIK, the standard DLL does about the same thing anyhow.
+#if 0
+    if ( m_windowStyle & wxTR_MULTIPLE )
+    {
+        wxBitmap bmp;
+
+        // create the DC compatible with the current screen
+        HDC hdcMem = CreateCompatibleDC(NULL);
+
+        // create a mono bitmap of the standard size
+        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
+                                         1,      // # bits needed for one pixel
+                                         0);     // array containing colour data
+        SelectObject(hdcMem, hbmpCheck);
+
+        // then draw a check mark into it
+        RECT rect = { 0, 0, x, y };
+        if ( !::DrawFrameControl(hdcMem, &rect,
+                                 DFC_BUTTON,
+                                 DFCS_BUTTONCHECK | DFCS_CHECKED) )
+        {
+            wxLogLastError(wxT("DrawFrameControl(check)"));
+        }
+
+        bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);
+        imagelistCheckboxes.Add(bmp);
+
+        if ( !::DrawFrameControl(hdcMem, &rect,
+                                 DFC_BUTTON,
+                                 DFCS_BUTTONCHECK) )
+        {
+            wxLogLastError(wxT("DrawFrameControl(uncheck)"));
+        }
+
+        bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);
+        imagelistCheckboxes.Add(bmp);
+
+        // clean up
+        ::DeleteDC(hdcMem);
+
+        // set the imagelist
+        SetStateImageList(&imagelistCheckboxes);
+    }
+#endif // 0

 
 

-wxTreeCtrl::wxTreeCtrl(void)
+    SetSize(pos.x, pos.y, size.x, size.y);
+
+    return TRUE;
+}
+
+wxTreeCtrl::~wxTreeCtrl()

 {
 {

-  m_imageListNormal = NULL;
-  m_imageListState = NULL;
+    DeleteTextCtrl();
+
+    // delete user data to prevent memory leaks
+    DeleteAllItems();

 }
 
 }
 

-bool wxTreeCtrl::Create(wxWindow *parent, const wxWindowID id, const wxPoint& pos, const wxSize& size,
-            const long style, const wxValidator& validator, const wxString& name)
+// ----------------------------------------------------------------------------
+// accessors
+// ----------------------------------------------------------------------------
+
+// simple wrappers which add error checking in debug mode
+
+bool wxTreeCtrl::DoGetItem(wxTreeViewItem* tvItem) const

 {
 {

-  wxSystemSettings settings;
-  SetBackgroundColour(settings.GetSystemColour(wxSYS_COLOUR_WINDOW));
-  SetForegroundColour(parent->GetDefaultForegroundColour());
+    if ( !TreeView_GetItem(GetHwnd(), tvItem) )
+    {
+        wxLogLastError("TreeView_GetItem");

 
 

-  SetName(name);
-  SetValidator(validator);
+        return FALSE;
+    }

 
 

-  m_imageListNormal = NULL;
-  m_imageListState = NULL;
+    return TRUE;
+}

 
 

-  int x = pos.x;
-  int y = pos.y;
-  int width = size.x;
-  int height = size.y;
+void wxTreeCtrl::DoSetItem(wxTreeViewItem* tvItem)
+{
+    if ( TreeView_SetItem(GetHwnd(), tvItem) == -1 )
+    {
+        wxLogLastError("TreeView_SetItem");
+    }
+}

 
 

-  m_windowStyle = style;
+size_t wxTreeCtrl::GetCount() const
+{
+    return (size_t)TreeView_GetCount(GetHwnd());
+}
+
+unsigned int wxTreeCtrl::GetIndent() const
+{
+    return TreeView_GetIndent(GetHwnd());
+}

 
 

-//  SetFont(wxTheFontList->FindOrCreateFont(11, wxSWISS, wxNORMAL, wxNORMAL));
+void wxTreeCtrl::SetIndent(unsigned int indent)
+{
+    TreeView_SetIndent(GetHwnd(), indent);
+}
+
+wxImageList *wxTreeCtrl::GetImageList() const
+{
+    return m_imageListNormal;
+}

 
 

-  SetParent(parent);
+wxImageList *wxTreeCtrl::GetStateImageList() const
+{
+    return m_imageListNormal;
+}

 
 

-  if (width <= 0)
-    width = 100;
-  if (height <= 0)
-    height = 30;
-  if (x < 0)
-    x = 0;
-  if (y < 0)
-    y = 0;
+void wxTreeCtrl::SetAnyImageList(wxImageList *imageList, int which)
+{
+    // no error return
+    TreeView_SetImageList(GetHwnd(),
+                          imageList ? imageList->GetHIMAGELIST() : 0,
+                          which);
+}

 
 

-  m_windowId = (id == -1) ? NewControlId() : id;
+void wxTreeCtrl::SetImageList(wxImageList *imageList)
+{
+    SetAnyImageList(m_imageListNormal = imageList, TVSIL_NORMAL);
+}

 
 

-  DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_LINESATROOT;
-  
-  bool want3D;
-  WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
+{
+    SetAnyImageList(m_imageListState = imageList, TVSIL_STATE);
+}

 
 

-  // 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;
+size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
+                                    bool recursively) const
+{
+    TraverseCounter counter(this, item, recursively);

 
 

-  if ( m_windowStyle & wxTR_HAS_BUTTONS )
-  wstyle |= TVS_HASBUTTONS;
+    return counter.GetCount() - 1;
+}

 
 

-  if ( m_windowStyle & wxTR_EDIT_LABELS )
-  wstyle |= TVS_EDITLABELS;
+// ----------------------------------------------------------------------------
+// Item access
+// ----------------------------------------------------------------------------

 
 

-  // Create the toolbar control.
-  HWND hWndTreeControl = CreateWindowEx(exStyle,
-    WC_TREEVIEW,
-    "",
-    wstyle,
-    x, y, width, height,
-    (HWND) parent->GetHWND(),
-    (HMENU)m_windowId,
-    wxGetInstance(),
-    NULL );
+wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
+{
+    wxChar buf[512];  // the size is arbitrary...

 
 

-  m_hWnd = (WXHWND) hWndTreeControl;
-  if (parent) parent->AddChild(this);
-  
-  SubclassWin((WXHWND) m_hWnd);
+    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] = wxT('\0');
+    }

 
 

-  return TRUE;
+    return wxString(buf);

 }
 
 }
 

-wxTreeCtrl::~wxTreeCtrl(void)
+void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)

 {
 {

-  m_textCtrl.SetHWND((WXHWND) NULL);
+    wxTreeViewItem tvItem(item, TVIF_TEXT);
+    tvItem.pszText = (wxChar *)text.c_str();  // conversion is ok
+    DoSetItem(&tvItem);

 }
 
 }
 

-// Attributes
-int wxTreeCtrl::GetCount(void) const
+int wxTreeCtrl::DoGetItemImageFromData(const wxTreeItemId& item,
+                                       wxTreeItemIcon which) const

 {
 {

-  return (int) TreeView_GetCount((HWND) GetHWND());
+    wxTreeViewItem tvItem(item, TVIF_PARAM);
+    if ( !DoGetItem(&tvItem) )
+    {
+        return -1;
+    }
+
+    return ((wxTreeItemIndirectData *)tvItem.lParam)->GetImage(which);

 }
 
 }
 

-int wxTreeCtrl::GetIndent(void) const
+void wxTreeCtrl::DoSetItemImageFromData(const wxTreeItemId& item,
+                                        int image,
+                                        wxTreeItemIcon which) const

 {
 {

-  return (int) TreeView_GetIndent((HWND) GetHWND());
+    wxTreeViewItem tvItem(item, TVIF_PARAM);
+    if ( !DoGetItem(&tvItem) )
+    {
+        return;
+    }
+
+    wxTreeItemIndirectData *data = ((wxTreeItemIndirectData *)tvItem.lParam);
+
+    data->SetImage(image, which);
+
+    // make sure that we have selected images as well
+    if ( which == wxTreeItemIcon_Normal &&
+         !data->HasImage(wxTreeItemIcon_Selected) )
+    {
+        data->SetImage(image, wxTreeItemIcon_Selected);
+    }
+
+    if ( which == wxTreeItemIcon_Expanded &&
+         !data->HasImage(wxTreeItemIcon_SelectedExpanded) )
+    {
+        data->SetImage(image, wxTreeItemIcon_SelectedExpanded);
+    }

 }
 
 }
 

-void wxTreeCtrl::SetIndent(int indent)
+void wxTreeCtrl::DoSetItemImages(const wxTreeItemId& item,
+                                 int image,
+                                 int imageSel)

 {
 {

-  TreeView_SetIndent((HWND) GetHWND(), indent);
+    wxTreeViewItem tvItem(item, TVIF_IMAGE | TVIF_SELECTEDIMAGE);
+    tvItem.iSelectedImage = imageSel;
+    tvItem.iImage = image;
+    DoSetItem(&tvItem);

 }
 
 }
 

-wxImageList *wxTreeCtrl::GetImageList(const int which) const
+int wxTreeCtrl::GetItemImage(const wxTreeItemId& item,
+                             wxTreeItemIcon which) const

 {
 {

-  if ( which == wxIMAGE_LIST_NORMAL )
+    if ( HasIndirectData(item) )

     {
     {

-    return m_imageListNormal;
-  }
-  else if ( which == wxIMAGE_LIST_STATE )
+        return DoGetItemImageFromData(item, which);
+    }
+
+    UINT mask;
+    switch ( which )

     {
     {

-    return m_imageListState;
-  }
-  return NULL;
+        default:
+            wxFAIL_MSG( wxT("unknown tree item image type") );
+
+        case wxTreeItemIcon_Normal:
+            mask = TVIF_IMAGE;
+            break;
+
+        case wxTreeItemIcon_Selected:
+            mask = TVIF_SELECTEDIMAGE;
+            break;
+
+        case wxTreeItemIcon_Expanded:
+        case wxTreeItemIcon_SelectedExpanded:
+            return -1;
+    }
+
+    wxTreeViewItem tvItem(item, mask);
+    DoGetItem(&tvItem);
+
+    return mask == TVIF_IMAGE ? tvItem.iImage : tvItem.iSelectedImage;
+}
+
+void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image,
+                              wxTreeItemIcon which)
+{
+    int imageNormal, imageSel;
+    switch ( which )
+    {
+        default:
+            wxFAIL_MSG( wxT("unknown tree item image type") );
+
+        case wxTreeItemIcon_Normal:
+            imageNormal = image;
+            imageSel = GetItemSelectedImage(item);
+            break;
+
+        case wxTreeItemIcon_Selected:
+            imageNormal = GetItemImage(item);
+            imageSel = image;
+            break;
+
+        case wxTreeItemIcon_Expanded:
+        case wxTreeItemIcon_SelectedExpanded:
+            if ( !HasIndirectData(item) )
+            {
+                // we need to get the old images first, because after we create
+                // the wxTreeItemIndirectData GetItemXXXImage() will use it to
+                // get the images
+                imageNormal = GetItemImage(item);
+                imageSel = GetItemSelectedImage(item);
+
+                // if it doesn't have it yet, add it
+                wxTreeItemIndirectData *data = new
+                    wxTreeItemIndirectData(this, item);
+
+                // copy the data to the new location
+                data->SetImage(imageNormal, wxTreeItemIcon_Normal);
+                data->SetImage(imageSel, wxTreeItemIcon_Selected);
+            }
+
+            DoSetItemImageFromData(item, image, which);
+
+            // reset the normal/selected images because we won't use them any
+            // more - now they're stored inside the indirect data
+            imageNormal =
+            imageSel = I_IMAGECALLBACK;
+            break;
+    }
+
+    // NB: at least in version 5.00.0518.9 of comctl32.dll we need to always
+    //     change both normal and selected image - otherwise the change simply
+    //     doesn't take place!
+    DoSetItemImages(item, imageNormal, imageSel);

 }
 
 }
 

-void wxTreeCtrl::SetImageList(wxImageList *imageList, const int which)
+wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const

 {
 {

-  int flags = 0;
-  if ( which == wxIMAGE_LIST_NORMAL )
+    wxTreeViewItem tvItem(item, TVIF_PARAM);
+    if ( !DoGetItem(&tvItem) )
+    {
+        return NULL;
+    }
+
+    if ( HasIndirectData(item) )

     {
     {

-    flags = TVSIL_NORMAL;
-    m_imageListNormal = imageList;
-  }
-  else if ( which == wxIMAGE_LIST_STATE )
+        return ((wxTreeItemIndirectData *)tvItem.lParam)->GetData();
+    }
+    else

     {
     {

-    flags = TVSIL_STATE;
-    m_imageListState = imageList;
-  }
-  TreeView_SetImageList((HWND) GetHWND(), (HIMAGELIST) imageList ? imageList->GetHIMAGELIST() : 0, flags);
+        return (wxTreeItemData *)tvItem.lParam;
+    }

 }
 
 }
 

-long wxTreeCtrl::GetNextItem(const long item, int code) const
+void wxTreeCtrl::SetItemData(const wxTreeItemId& item, wxTreeItemData *data)

 {
 {

-  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;
+    wxTreeViewItem tvItem(item, TVIF_PARAM);

 
 

-    default :
-      break;
-  }
-  return (long) TreeView_GetNextItem( (HWND) GetHWND(), (HTREEITEM) item, flag);
+    if ( HasIndirectData(item) )
+    {
+        if ( DoGetItem(&tvItem) )
+        {
+            ((wxTreeItemIndirectData *)tvItem.lParam)->SetData(data);
+        }
+        else
+        {
+            wxFAIL_MSG( wxT("failed to change tree items data") );
+        }
+    }
+    else
+    {
+        tvItem.lParam = (LPARAM)data;
+        DoSetItem(&tvItem);
+    }

 }
 
 }
 

-bool wxTreeCtrl::ItemHasChildren(const long item) const
+void wxTreeCtrl::SetIndirectItemData(const wxTreeItemId& item,
+                                     wxTreeItemIndirectData *data)

 {
 {

-  TV_ITEM item2;
-  item2.hItem = (HTREEITEM) item;
-  item2.mask = TVIF_CHILDREN;
-  TreeView_GetItem((HWND) GetHWND(), &item2);
-  return (item2.cChildren != 0);
+    // this should never happen because it's unnecessary and will probably lead
+    // to crash too because the code elsewhere supposes that the pointer the
+    // wxTreeItemIndirectData has is a real wxItemData and not
+    // wxTreeItemIndirectData as well
+    wxASSERT_MSG( !HasIndirectData(item), wxT("setting indirect data twice?") );
+
+    SetItemData(item, (wxTreeItemData *)data);
+
+    m_itemsWithIndirectData.Add(item);

 }
 
 }
 

-long wxTreeCtrl::GetChild(const long item) const
+bool wxTreeCtrl::HasIndirectData(const wxTreeItemId& item) const

 {
 {

-  return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_CHILD, (LPARAM)item);
+    return m_itemsWithIndirectData.Index(item) != wxNOT_FOUND;

 }
 
 }
 

-long wxTreeCtrl::GetParent(const long item) const
+void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)

 {
 {

-  return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_PARENT, (LPARAM)item);
+    wxTreeViewItem tvItem(item, TVIF_CHILDREN);
+    tvItem.cChildren = (int)has;
+    DoSetItem(&tvItem);

 }
 
 }
 

-long wxTreeCtrl::GetFirstVisibleItem(void) const
+void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)

 {
 {

-  return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_FIRSTVISIBLE, 0);
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_BOLD);
+    tvItem.state = bold ? TVIS_BOLD : 0;
+    DoSetItem(&tvItem);

 }
 
 }
 

-long wxTreeCtrl::GetNextVisibleItem(const long item) const
+void wxTreeCtrl::SetItemDropHighlight(const wxTreeItemId& item, bool highlight)

 {
 {

-  return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_NEXTVISIBLE, (LPARAM)item);
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_DROPHILITED);
+    tvItem.state = highlight ? TVIS_DROPHILITED : 0;
+    DoSetItem(&tvItem);

 }
 
 }
 

-long wxTreeCtrl::GetSelection(void) const
+// ----------------------------------------------------------------------------
+// Item status
+// ----------------------------------------------------------------------------
+
+bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const

 {
 {

-  return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_CARET, 0);
+    // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect
+    RECT rect;
+    return SendMessage(GetHwnd(), TVM_GETITEMRECT, FALSE, (LPARAM)&rect) != 0;
+

 }
 
 }
 

-long wxTreeCtrl::GetRootItem(void) const
+bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const

 {
 {

-  return (long) ::SendMessage((HWND) GetHWND(), TVM_GETNEXTITEM, TVGN_ROOT, 0);
+    wxTreeViewItem tvItem(item, TVIF_CHILDREN);
+    DoGetItem(&tvItem);
+
+    return tvItem.cChildren != 0;

 }
 
 }
 

-// TODO: convert mask
-bool wxTreeCtrl::GetItem(wxTreeItem& info) const
+bool wxTreeCtrl::IsExpanded(const wxTreeItemId& item) const

 {
 {

-  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;
+    // probably not a good idea to put it here
+    //wxASSERT( ItemHasChildren(item) );

 
 

-  bool success = TreeView_GetItem((HWND)GetHWND(), &tvItem) != 0;
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_EXPANDED);
+    DoGetItem(&tvItem);

 
 

-  if ( !success )
-  {
-    wxLogSysError("TreeView_GetItem failed");
+    return (tvItem.state & TVIS_EXPANDED) != 0;
+}

 
 

-    if (tvItem.pszText)
-      delete[] tvItem.pszText;
+bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
+{
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_SELECTED);
+    DoGetItem(&tvItem);

 
 

-    return FALSE;
-  }
+    return (tvItem.state & TVIS_SELECTED) != 0;
+}

 
 

-  wxConvertFromMSWTreeItem(info, tvItem);
+bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
+{
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_BOLD);
+    DoGetItem(&tvItem);
+
+    return (tvItem.state & TVIS_BOLD) != 0;
+}
+
+// ----------------------------------------------------------------------------
+// navigation
+// ----------------------------------------------------------------------------
+
+wxTreeItemId wxTreeCtrl::GetRootItem() const
+{
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetRoot(GetHwnd()));
+}

 
 

-  if (tvItem.pszText)
-    delete[] tvItem.pszText;
+wxTreeItemId wxTreeCtrl::GetSelection() const
+{
+    wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (WXHTREEITEM)0,
+                 wxT("this only works with single selection controls") );

 
 

-  return success;
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetSelection(GetHwnd()));

 }
 
 }
 

-bool wxTreeCtrl::SetItem(wxTreeItem& info)
+wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const

 {
 {

-  TV_ITEM item;
-    wxConvertToMSWTreeItem(info, item);
-  return (::SendMessage((HWND) GetHWND(), TVM_SETITEM, 0, (LPARAM)&item) != 0);
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetParent(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));

 }
 
 }
 

-int  wxTreeCtrl::GetItemState(const long item, const long stateMask) const
+wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
+                                       long& _cookie) const

 {
 {

-  wxTreeItem info;
+    // remember the last child returned in 'cookie'
+    _cookie = (long)TreeView_GetChild(GetHwnd(), (HTREEITEM) (WXHTREEITEM)item);

 
 

-  info.m_mask = wxTREE_MASK_STATE ;
-  info.m_stateMask = stateMask;
-  info.m_itemId = item;
+    return wxTreeItemId((WXHTREEITEM)_cookie);
+}

 
 

-  if (!GetItem(info))
-    return 0;
+wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
+                                      long& _cookie) const
+{
+    wxTreeItemId l = wxTreeItemId((WXHTREEITEM)TreeView_GetNextSibling(GetHwnd(),
+                                   (HTREEITEM)(WXHTREEITEM)_cookie));
+    _cookie = (long)l;
+
+    return l;
+}
+
+wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
+{
+    // can this be done more efficiently?
+    long cookie;
+
+    wxTreeItemId childLast,
+    child = GetFirstChild(item, cookie);
+    while ( child.IsOk() )
+    {
+        childLast = child;
+        child = GetNextChild(item, cookie);
+    }
+
+    return childLast;
+}
+
+wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
+{
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));
+}
+
+wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
+{
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevSibling(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));
+}
+
+wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
+{
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetFirstVisible(GetHwnd()));
+}
+
+wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
+{
+    wxASSERT_MSG( IsVisible(item), wxT("The item you call GetNextVisible() "
+                                      "for must be visible itself!"));

 
 

-  return info.m_state;
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetNextVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));

 }
 
 }
 

-bool wxTreeCtrl::SetItemState(const long item, const long state, const long stateMask)
+wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const

 {
 {

-  wxTreeItem info;
+    wxASSERT_MSG( IsVisible(item), wxT("The item you call GetPrevVisible() "
+                                      "for must be visible itself!"));

 
 

-  info.m_mask = wxTREE_MASK_STATE ;
-  info.m_state = state;
-  info.m_stateMask = stateMask;
-  info.m_itemId = item;
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));
+}
+
+// ----------------------------------------------------------------------------
+// multiple selections emulation
+// ----------------------------------------------------------------------------
+
+bool wxTreeCtrl::IsItemChecked(const wxTreeItemId& item) const
+{
+    // receive the desired information.
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
+    DoGetItem(&tvItem);

 
 

-  return SetItem(info);
+    // state image indices are 1 based
+    return ((tvItem.state >> 12) - 1) == 1;

 }
 
 }
 

-bool wxTreeCtrl::SetItemImage(const long item, const int image, const int selImage)
+void wxTreeCtrl::SetItemCheck(const wxTreeItemId& item, bool check)

 {
 {

-  wxTreeItem info;
+    // receive the desired information.
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);

 
 

-  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;
+    // state images are one-based
+    tvItem.state = (check ? 2 : 1) << 12;

 
 

-  return SetItem(info);
+    DoSetItem(&tvItem);

 }
 
 }
 

-wxString wxTreeCtrl::GetItemText(const long item) const
+size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds& selections) const

 {
 {

-  wxTreeItem info;
+    TraverseSelections selector(this, selections);
+
+    return selections.GetCount();
+}

 
 

-  info.m_mask = wxTREE_MASK_TEXT ;
-  info.m_itemId = item;
+// ----------------------------------------------------------------------------
+// Usual operations
+// ----------------------------------------------------------------------------
+
+wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
+                                      wxTreeItemId hInsertAfter,
+                                      const wxString& text,
+                                      int image, int selectedImage,
+                                      wxTreeItemData *data)
+{
+    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 )
+    {
+        tvIns.hInsertAfter = TVI_FIRST;
+    }

 
 

-  if (!GetItem(info))
-    return wxString("");
-  return info.m_text;
+    UINT mask = 0;
+    if ( !text.IsEmpty() )
+    {
+        mask |= TVIF_TEXT;
+        tvIns.item.pszText = (wxChar *)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;
+        }
+    }
+
+    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(GetHwnd(), &tvIns);
+    if ( id == 0 )
+    {
+        wxLogLastError("TreeView_InsertItem");
+    }
+
+    if ( data != NULL )
+    {
+        // associate the application tree item with Win32 tree item handle
+        data->SetId((WXHTREEITEM)id);
+    }
+
+    return wxTreeItemId((WXHTREEITEM)id);

 }
 
 }
 

-void wxTreeCtrl::SetItemText(const long item, const wxString& str)
+// for compatibility only
+wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
+                                    const wxString& text,
+                                    int image, int selImage,
+                                    long insertAfter)

 {
 {

-  wxTreeItem info;
+    return DoInsertItem(parent, (WXHTREEITEM)insertAfter, text,
+                        image, selImage, NULL);
+}

 
 

-  info.m_mask = wxTREE_MASK_TEXT ;
-  info.m_itemId = item;
-  info.m_text = str;
+wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
+                                 int image, int selectedImage,
+                                 wxTreeItemData *data)
+{
+    return DoInsertItem(wxTreeItemId((WXHTREEITEM) 0), (WXHTREEITEM) 0,
+                        text, image, selectedImage, data);
+}

 
 

-  SetItem(info);
+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);

 }
 
 }
 

-long wxTreeCtrl::GetItemData(const long item) const
+wxTreeItemId wxTreeCtrl::InsertItem(const wxTreeItemId& parent,
+                                    const wxTreeItemId& idPrevious,
+                                    const wxString& text,
+                                    int image, int selectedImage,
+                                    wxTreeItemData *data)

 {
 {

-  wxTreeItem info;
+    return DoInsertItem(parent, idPrevious, text, image, selectedImage, data);
+}

 
 

-  info.m_mask = wxTREE_MASK_DATA ;
-  info.m_itemId = item;
+wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent,
+                                    const wxString& text,
+                                    int image, int selectedImage,
+                                    wxTreeItemData *data)
+{
+    return DoInsertItem(parent, (WXHTREEITEM) TVI_LAST,
+                        text, image, selectedImage, data);
+}

 
 

-  if (!GetItem(info))
-    return 0;
-  return info.m_data;
+void wxTreeCtrl::Delete(const wxTreeItemId& item)
+{
+    if ( !TreeView_DeleteItem(GetHwnd(), (HTREEITEM)(WXHTREEITEM)item) )
+    {
+        wxLogLastError("TreeView_DeleteItem");
+    }

 }
 
 }
 

-bool wxTreeCtrl::SetItemData(const long item, long data)
+// delete all children (but don't delete the item itself)
+void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)

 {
 {

-  wxTreeItem info;
+    long cookie;
+
+    wxArrayLong children;
+    wxTreeItemId child = GetFirstChild(item, cookie);
+    while ( child.IsOk() )
+    {
+        children.Add((long)(WXHTREEITEM)child);

 
 

-  info.m_mask = wxTREE_MASK_DATA ;
-  info.m_itemId = item;
-  info.m_data = data;
+        child = GetNextChild(item, cookie);
+    }

 
 

-  return SetItem(info);
+    size_t nCount = children.Count();
+    for ( size_t n = 0; n < nCount; n++ )
+    {
+        if ( !TreeView_DeleteItem(GetHwnd(), (HTREEITEM)children[n]) )
+        {
+            wxLogLastError("TreeView_DeleteItem");
+        }
+    }

 }
 
 }
 

-bool wxTreeCtrl::GetItemRect(const long item, wxRectangle& rect, bool textOnly) const
+void wxTreeCtrl::DeleteAllItems()

 {
 {

-  RECT rect2;
+    if ( !TreeView_DeleteAllItems(GetHwnd()) )
+    {
+        wxLogLastError("TreeView_DeleteAllItems");
+    }
+}
+
+void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
+{
+    wxASSERT_MSG( flag == TVE_COLLAPSE ||
+                  flag == (TVE_COLLAPSE | TVE_COLLAPSERESET) ||
+                  flag == TVE_EXPAND   ||
+                  flag == TVE_TOGGLE,
+                  wxT("Unknown flag in wxTreeCtrl::DoExpand") );
+
+    // TreeView_Expand doesn't send TVN_ITEMEXPAND(ING) messages, so we must
+    // emulate them. This behaviour has changed slightly with comctl32.dll
+    // v 4.70 - now it does send them but only the first time. To maintain
+    // compatible behaviour and also in order to not have surprises with the
+    // future versions, don't rely on this and still do everything ourselves.
+    // To avoid that the messages be sent twice when the item is expanded for
+    // the first time we must clear TVIS_EXPANDEDONCE style manually.
+
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_EXPANDEDONCE);
+    tvItem.state = 0;
+    DoSetItem(&tvItem);
+
+    if ( TreeView_Expand(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item, flag) != 0 )
+    {
+        wxTreeEvent event(wxEVT_NULL, m_windowId);
+        event.m_item = item;
+
+        bool isExpanded = IsExpanded(item);

 
 

-  *(HTREEITEM*)& rect2 = (HTREEITEM) item;
-  bool success = (::SendMessage((HWND) GetHWND(), TVM_GETITEMRECT, (WPARAM)textOnly,
-    (LPARAM)&rect2) != 0);
+        event.SetEventObject(this);

 
 

-  rect.x = rect2.left;
-  rect.y = rect2.top;
-  rect.width = rect2.right - rect2.left;
-  rect.height = rect2.bottom - rect2.left;
-  return success;
+        // FIXME return value 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: change didn't took place, so do nothing at all
+}
+
+void wxTreeCtrl::Expand(const wxTreeItemId& item)
+{
+    DoExpand(item, TVE_EXPAND);

 }
 
 }
 

-wxTextCtrl& wxTreeCtrl::GetEditControl(void) const
+void wxTreeCtrl::Collapse(const wxTreeItemId& item)

 {
 {

-  HWND hWnd = (HWND) TreeView_GetEditControl((HWND) GetHWND());
-  ((wxTreeCtrl *)this)->m_textCtrl.SetHWND((WXHWND) hWnd);
-  return (wxTextCtrl&) m_textCtrl;
+    DoExpand(item, TVE_COLLAPSE);

 }
 
 }
 

-// Operations
-bool wxTreeCtrl::DeleteItem(const long item)
+void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item)

 {
 {

-  return (TreeView_DeleteItem((HWND) GetHWND(), (HTREEITEM) item) != 0);
+    DoExpand(item, TVE_COLLAPSE | TVE_COLLAPSERESET);

 }
 
 }
 

-bool wxTreeCtrl::ExpandItem(const long item, const int action)
+void wxTreeCtrl::Toggle(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);
+    DoExpand(item, TVE_TOGGLE);

 }
 
 }
 

-long wxTreeCtrl::InsertItem(const long parent, wxTreeItem& info, const long insertAfter)
+void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)

 {
 {

-  TV_INSERTSTRUCT tvInsertStruct;
-  tvInsertStruct.hParent = (HTREEITEM) parent ;
-  tvInsertStruct.hInsertAfter = (HTREEITEM) insertAfter ;
+    DoExpand(item, action);
+}

 
 

-  wxConvertToMSWTreeItem(info, tvInsertStruct.item);
+void wxTreeCtrl::Unselect()
+{
+    wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE), wxT("doesn't make sense") );

 
 

-  return (long) TreeView_InsertItem((HWND) GetHWND(), & tvInsertStruct);
+    // just remove the selection
+    SelectItem(wxTreeItemId((WXHTREEITEM) 0));

 }
 
 }
 

-long wxTreeCtrl::InsertItem(const long parent, const wxString& label, const int image, const int selImage,
-  const long insertAfter)
+void wxTreeCtrl::UnselectAll()

 {
 {

-  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;
+    if ( m_windowStyle & wxTR_MULTIPLE )
+    {
+        wxArrayTreeItemIds selections;
+        size_t count = GetSelections(selections);
+        for ( size_t n = 0; n < count; n++ )
+        {
+            SetItemCheck(selections[n], FALSE);
+        }
+    }

     else
     else

-      info.m_selectedImage = selImage;
-  }
+    {
+        // just remove the selection
+        Unselect();
+    }
+}

 
 

-  return InsertItem(parent, info, insertAfter);
+void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
+{
+    if ( m_windowStyle & wxTR_MULTIPLE )
+    {
+        // selecting the item means checking it
+        SetItemCheck(item);
+    }
+    else
+    {
+        // 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
+
+        wxTreeEvent event(wxEVT_NULL, m_windowId);
+        event.m_item = item;
+        event.SetEventObject(this);
+
+        event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGING);
+        if ( !GetEventHandler()->ProcessEvent(event) || event.IsAllowed() )
+        {
+            if ( !TreeView_SelectItem(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item) )
+            {
+                wxLogLastError("TreeView_SelectItem");
+            }
+            else
+            {
+                event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
+                (void)GetEventHandler()->ProcessEvent(event);
+            }
+        }
+        //else: program vetoed the change
+    }

 }
 
 }
 

-bool wxTreeCtrl::SelectItem(const long item)
+void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)

 {
 {

-  return (TreeView_SelectItem((HWND) GetHWND(), (HTREEITEM) item) != 0);
+    // no error return
+    TreeView_EnsureVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item);

 }
 
 }
 

-bool wxTreeCtrl::ScrollTo(const long item)
+void wxTreeCtrl::ScrollTo(const wxTreeItemId& item)

 {
 {

-  return (TreeView_SelectSetFirstVisible((HWND) GetHWND(), (HTREEITEM) item) != 0);
+    if ( !TreeView_SelectSetFirstVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item) )
+    {
+        wxLogLastError("TreeView_SelectSetFirstVisible");
+    }

 }
 
 }
 

-bool wxTreeCtrl::DeleteAllItems(void)
+wxTextCtrl* wxTreeCtrl::GetEditControl() const

 {
 {

-  return (TreeView_DeleteAllItems((HWND) GetHWND()) != 0);
+    return m_textCtrl;

 }
 
 }
 

-wxTextCtrl& wxTreeCtrl::Edit(const long item)
+void wxTreeCtrl::DeleteTextCtrl()

 {
 {

-  HWND hWnd = (HWND) TreeView_EditLabel((HWND) GetHWND(), item);
-  m_textCtrl.SetHWND((WXHWND) hWnd);
-  return m_textCtrl;
+    if ( m_textCtrl )
+    {
+        m_textCtrl->UnsubclassWin();
+        m_textCtrl->SetHWND(0);
+        delete m_textCtrl;
+        m_textCtrl = NULL;
+    }

 }
 
 }
 

-long wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
+wxTextCtrl* wxTreeCtrl::EditLabel(const wxTreeItemId& item,
+                                  wxClassInfo* textControlClass)

 {
 {

-    TV_HITTESTINFO hitTestInfo;
-  hitTestInfo.pt.x = (int) point.x;
-  hitTestInfo.pt.y = (int) point.y;
+    wxASSERT( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)) );
+
+    HWND hWnd = (HWND) TreeView_EditLabel(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item);
+
+    // this is not an error - the TVN_BEGINLABELEDIT handler might have
+    // returned FALSE
+    if ( !hWnd )
+    {
+        return NULL;
+    }

 
 

-    TreeView_HitTest((HWND) GetHWND(), & hitTestInfo);
+    DeleteTextCtrl();

 
 

-  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;
+    m_textCtrl = (wxTextCtrl *)textControlClass->CreateObject();
+    m_textCtrl->SetHWND((WXHWND)hWnd);
+    m_textCtrl->SubclassWin((WXHWND)hWnd);

 
 

-  return (long) hitTestInfo.hItem ;
+    return m_textCtrl;

 }
 
 }
 

-/*
-wxImageList *wxTreeCtrl::CreateDragImage(const long item)
+// End label editing, optionally cancelling the edit
+void wxTreeCtrl::EndEditLabel(const wxTreeItemId& item, bool discardChanges)

 {
 {

+    TreeView_EndEditLabelNow(GetHwnd(), discardChanges);
+
+    DeleteTextCtrl();

 }
 }

-*/

 
 

-bool wxTreeCtrl::SortChildren(const long item)
+wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)

 {
 {

-  return (TreeView_SortChildren((HWND) GetHWND(), (HTREEITEM) item, 0) != 0);
+    TV_HITTESTINFO hitTestInfo;
+    hitTestInfo.pt.x = (int)point.x;
+    hitTestInfo.pt.y = (int)point.y;
+
+    TreeView_HitTest(GetHwnd(), &hitTestInfo);
+
+    flags = 0;
+
+    // avoid repetition
+    #define TRANSLATE_FLAG(flag) if ( hitTestInfo.flags & TVHT_##flag ) \
+                                    flags |= wxTREE_HITTEST_##flag
+
+    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);
+
+    #undef TRANSLATE_FLAG
+
+    return wxTreeItemId((WXHTREEITEM) hitTestInfo.hItem);

 }
 
 }
 

-bool wxTreeCtrl::EnsureVisible(const long item)
+bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
+                                 wxRect& rect,
+                                 bool textOnly) const

 {
 {

-  return (TreeView_EnsureVisible((HWND) GetHWND(), (HTREEITEM) item) != 0);
+    RECT rc;
+    if ( TreeView_GetItemRect(GetHwnd(), (HTREEITEM)(WXHTREEITEM)item,
+                              &rc, textOnly) )
+    {
+        rect = wxRect(wxPoint(rc.left, rc.top), wxPoint(rc.right, rc.bottom));
+
+        return TRUE;
+    }
+    else
+    {
+        // couldn't retrieve rect: for example, item isn't visible
+        return FALSE;
+    }

 }
 
 }
 

-bool wxTreeCtrl::MSWCommand(const WXUINT cmd, const WXWORD id)
+// ----------------------------------------------------------------------------
+// sorting stuff
+// ----------------------------------------------------------------------------
+
+static int CALLBACK TreeView_CompareCallback(wxTreeItemData *pItem1,
+                                             wxTreeItemData *pItem2,
+                                             wxTreeCtrl *tree)

 {
 {

-  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(0, m_windowId);
-  int eventType = 0;
-  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);
-  }
+    wxCHECK_MSG( pItem1 && pItem2, 0,
+                 wxT("sorting tree without data doesn't make sense") );

 
 

-    return TRUE;
+    return tree->OnCompareItems(pItem1->GetId(), pItem2->GetId());

 }
 
 }
 

-// Tree item structure
-wxTreeItem::wxTreeItem(void)
+int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
+                               const wxTreeItemId& item2)

 {
 {

-    m_mask = 0;
-    m_itemId = 0;
-    m_state = 0;
-    m_stateMask = 0;
-    m_image = -1;
-    m_selectedImage = -1;
-    m_children = 0;
-  m_data = 0;
+    return wxStrcmp(GetItemText(item1), GetItemText(item2));

 }
 
 }
 

-// 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)
+void wxTreeCtrl::SortChildren(const wxTreeItemId& item)

 {
 {

-  info.m_data = tvItem.lParam;
-  info.m_mask = 0;
-  info.m_state = 0;
-  info.m_stateMask = 0;
+    // 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) )
+    {
+        TreeView_SortChildren(GetHwnd(), (HTREEITEM)(WXHTREEITEM)item, 0);
+    }
+    else
+    {
+        TV_SORTCB tvSort;
+        tvSort.hParent = (HTREEITEM)(WXHTREEITEM)item;
+        tvSort.lpfnCompare = (PFNTVCOMPARE)TreeView_CompareCallback;
+        tvSort.lParam = (LPARAM)this;
+        TreeView_SortChildrenCB(GetHwnd(), &tvSort, 0 /* reserved */);
+    }
+}

 
 

-  long oldMask = tvItem.mask;
+// ----------------------------------------------------------------------------
+// implementation
+// ----------------------------------------------------------------------------

 
 

-  bool needText = FALSE;
-  if (getFullInfo != 0)
-  {
-    if ( tvItem.mask & TVIF_TEXT )
-      needText = FALSE;
+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

-      needText = TRUE;
+    {
+        // nothing done
+        return FALSE;
+    }
+
+    // command processed
+    return TRUE;
+}

 
 

-    if ( needText )
+// 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 )

     {
     {

-      tvItem.pszText = new char[513];
-      tvItem.cchTextMax = 512;
+        case NM_RCLICK:
+        {
+            if ( wxControl::MSWOnNotify(idCtrl, lParam, result) )
+                return TRUE;
+
+            TV_HITTESTINFO tvhti;
+            ::GetCursorPos(&(tvhti.pt));
+            ::ScreenToClient(GetHwnd(),&(tvhti.pt));
+            if ( TreeView_HitTest(GetHwnd(),&tvhti) )
+            {
+                if( tvhti.flags & TVHT_ONITEM )
+                {
+                    event.m_item = (WXHTREEITEM) tvhti.hItem;
+                    eventType=wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
+                }
+            }
+            break;
+        }
+
+        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;
+                event.m_label = info->item.pszText;
+                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;
+                event.m_label = info->item.pszText;
+                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(wxT("unexpected code %d in TVN_ITEMEXPAND "
+                                      "message"), tv->action);
+                }
+
+                bool ing = ((int)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);

     }
     }

-    tvItem.mask |= TVIF_HANDLE | TVIF_STATE | TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE | TVIF_CHILDREN | TVIF_PARAM ;
-    ::SendMessage(getFullInfo, TVM_GETITEM, 0, (LPARAM)& tvItem) ;
-  }

 
 

-  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();
-    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;
-  }
+    event.SetEventObject(this);
+    event.SetEventType(eventType);
+
+    bool processed = GetEventHandler()->ProcessEvent(event);
+
+    // post processing
+    switch ( hdr->code )
+    {
+        case 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 ourself (otherwise deleting a tree
+                //     with many items is just too slow)
+                NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam;
+
+                wxTreeItemId item = event.m_item;
+                if ( HasIndirectData(item) )
+                {
+                    wxTreeItemIndirectData *data = (wxTreeItemIndirectData *)
+                                                        tv->itemOld.lParam;
+                    delete data; // can't be NULL here
+
+                    m_itemsWithIndirectData.Remove(item);
+                }
+                else
+                {
+                    wxTreeItemData *data = (wxTreeItemData *)tv->itemOld.lParam;
+                    delete data; // may be NULL, ok
+                }
+
+                processed = TRUE; // Make sure we don't get called twice
+            }
+            break;
+
+        case TVN_BEGINLABELEDIT:
+            // return TRUE to cancel label editing
+            *result = !event.IsAllowed();
+            break;
+
+        case TVN_ENDLABELEDIT:
+            // return TRUE to set the label to the new string
+            *result = event.IsAllowed();
+
+            // ensure that we don't have the text ctrl which is going to be
+            // deleted any more
+            DeleteTextCtrl();
+            break;
+
+        case TVN_SELCHANGING:
+        case TVN_ITEMEXPANDING:
+            // return TRUE to prevent the action from happening
+            *result = !event.IsAllowed();
+            break;
+
+        case TVN_GETDISPINFO:
+            // NB: so far the user can't set the image himself anyhow, so do it
+            //     anyway - but this may change later
+            if ( /* !processed && */ 1 )
+            {
+                wxTreeItemId item = event.m_item;
+                TV_DISPINFO *info = (TV_DISPINFO *)lParam;
+                if ( info->item.mask & TVIF_IMAGE )
+                {
+                    info->item.iImage =
+                        DoGetItemImageFromData
+                        (
+                         item,
+                         IsExpanded(item) ? wxTreeItemIcon_Expanded
+                                          : wxTreeItemIcon_Normal
+                        );
+                }
+                if ( info->item.mask & TVIF_SELECTEDIMAGE )
+                {
+                    info->item.iSelectedImage =
+                        DoGetItemImageFromData
+                        (
+                         item,
+                         IsExpanded(item) ? wxTreeItemIcon_SelectedExpanded
+                                          : wxTreeItemIcon_Selected
+                        );
+                }
+            }
+            break;
+
+        //default:
+            // for the other messages the return value is ignored and there is
+            // nothing special to do
+    }
+
+    return processed;

 }
 
 }
 

+// ----------------------------------------------------------------------------

 // Tree event
 // Tree event

-IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxCommandEvent)
+// ----------------------------------------------------------------------------

 
 

-wxTreeEvent::wxTreeEvent(WXTYPE commandType, int id):
-  wxCommandEvent(commandType, id)
+IMPLEMENT_DYNAMIC_CLASS(wxTreeEvent, wxNotifyEvent)
+
+wxTreeEvent::wxTreeEvent(wxEventType commandType, int id)
+           : wxNotifyEvent(commandType, id)

 {
 {

-  m_code = 0;
-  m_oldItem = 0;
+    m_code = 0;
+    m_itemOld = 0;

 }
 
 }
 

-#endif
+#endif // __WIN95__