fixed somebody's poorly done StreamSize-->GetSize transition

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 07ff06e610949d6cf23614697a10400d59dd0f1b..8363d6ca9f58e033820252684541e2cb2f9396e3 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -27,8 +27,16 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx/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
+
+#ifdef GetNextSibling
+    #undef GetNextSibling

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


@@ -36,15 +44,15 @@
 #include "wx/log.h"
 #include "wx/dynarray.h"
 #include "wx/imaglist.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/treectrl.h"

 
 #ifdef __GNUWIN32__
 
 #ifdef __GNUWIN32__

+#ifndef wxUSE_NORLANDER_HEADERS

 #include "wx/msw/gnuwin32/extra.h"
 #endif
 #include "wx/msw/gnuwin32/extra.h"
 #endif

+#endif

 
 

-#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__) || defined(wxUSE_NORLANDER_HEADERS)

     #include <commctrl.h>
 #endif
 
     #include <commctrl.h>
 #endif
 


@@ -60,15 +68,45 @@
 // a convenient wrapper around TV_ITEM struct which adds a ctor
 struct wxTreeViewItem : public TV_ITEM
 {
 // 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)
+    wxTreeViewItem(const wxTreeItemId& item,    // the item handle
+                   UINT mask_,                  // fields which are valid
+                   UINT stateMask_ = 0)         // for TVIF_STATE only

     {
     {

-        mask = mask_;
+        // hItem member is always valid
+        mask = mask_ | TVIF_HANDLE;

         stateMask = stateMask_;
         hItem = (HTREEITEM) (WXHTREEITEM) item;
     }
 };
 
         stateMask = stateMask_;
         hItem = (HTREEITEM) (WXHTREEITEM) item;
     }
 };
 

+// 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;
+};
+

 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // macros
 // ----------------------------------------------------------------------------


@@ -77,9 +115,6 @@ struct wxTreeViewItem : public TV_ITEM
     IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
 #endif
 
     IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
 #endif
 

-// hide the ugly cast (of course, the macro is _quite_ ugly too...)
-#define wxhWnd    ((HWND)m_hWnd)
-

 // ----------------------------------------------------------------------------
 // variables
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // variables
 // ----------------------------------------------------------------------------


@@ -95,6 +130,37 @@ static const wxEventType g_events[2][2] =
 // implementation
 // ============================================================================
 
 // 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
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // construction and destruction
 // ----------------------------------------------------------------------------


@@ -106,66 +172,98 @@ void wxTreeCtrl::Init()
     m_textCtrl = NULL;
 }
 
     m_textCtrl = NULL;
 }
 

-bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
-                        const wxPoint& pos, const wxSize& size,
-                        long style, const wxValidator& validator,
+bool wxTreeCtrl::Create(wxWindow *parent,
+                        wxWindowID id,
+                        const wxPoint& pos,
+                        const wxSize& size,
+                        long style,
+                        const wxValidator& validator,

                         const wxString& name)
 {
     Init();
 
                         const wxString& name)
 {
     Init();
 

-    wxSystemSettings settings;
+    if ( !CreateControl(parent, id, pos, size, style, validator, name) )
+        return FALSE;

 
 

-    SetName(name);
-    SetValidator(validator);
+    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP |
+                   TVS_HASLINES | TVS_SHOWSELALWAYS;

 
 

-    m_windowStyle = style;
+    if ( m_windowStyle & wxTR_HAS_BUTTONS )
+        wstyle |= TVS_HASBUTTONS;

 
 

-    SetParent(parent);
+    if ( m_windowStyle & wxTR_EDIT_LABELS )
+        wstyle |= TVS_EDITLABELS;

 
 

-    m_windowId = (id == -1) ? NewControlId() : id;
+    if ( m_windowStyle & wxTR_LINES_AT_ROOT )
+        wstyle |= TVS_LINESATROOT;

 
 

-    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_SHOWSELALWAYS ;
+#if !defined( __GNUWIN32__ ) && !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 ( m_windowStyle & wxTR_MULTIPLE )
+        wstyle |= TVS_CHECKBOXES;
+#endif

 
 

+    // Create the tree control.
+    if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )
+        return FALSE;

 
 

-    bool want3D;
-    WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
+    // the treectrl with any other background looks ugly because the items
+    // background is white anyhow
+    SetBackgroundColour(*wxWHITE);

 
 

-    // Even with extended styles, need to combine with WS_BORDER
-    // for them to look right.
-    if ( want3D || wxStyleHasBorder(m_windowStyle) )
+    // 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 )

     {
     {

-        wstyle |= WS_BORDER;
-    }
+        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(_T("DrawFrameControl(check)"));
+        }

 
 

-    if ( m_windowStyle & wxTR_HAS_BUTTONS )
-        wstyle |= TVS_HASBUTTONS;
+        bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);
+        imagelistCheckboxes.Add(bmp);

 
 

-    if ( m_windowStyle & wxTR_EDIT_LABELS )
-        wstyle |= TVS_EDITLABELS;
+        if ( !::DrawFrameControl(hdcMem, &rect,
+                                 DFC_BUTTON,
+                                 DFCS_BUTTONCHECK) )
+        {
+            wxLogLastError(_T("DrawFrameControl(uncheck)"));
+        }

 
 

-    if ( m_windowStyle & wxTR_LINES_AT_ROOT )
-        wstyle |= TVS_LINESATROOT;
+        bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);
+        imagelistCheckboxes.Add(bmp);

 
 

-    // 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
-                       );
-
-    wxCHECK_MSG( m_hWnd, FALSE, "Failed to create tree ctrl" );
-
-    if ( parent )
-        parent->AddChild(this);
-
-    SubclassWin(m_hWnd);
+        // clean up
+        ::DeleteDC(hdcMem);
+
+        // set the imagelist
+        SetStateImageList(&imagelistCheckboxes);
+    }
+#endif // 0
+
+    SetSize(pos.x, pos.y, size.x, size.y);

 
     return TRUE;
 }
 
     return TRUE;
 }


@@ -186,7 +284,7 @@ wxTreeCtrl::~wxTreeCtrl()
 
 bool wxTreeCtrl::DoGetItem(wxTreeViewItem* tvItem) const
 {
 
 bool wxTreeCtrl::DoGetItem(wxTreeViewItem* tvItem) const
 {

-    if ( !TreeView_GetItem(wxhWnd, tvItem) )
+    if ( !TreeView_GetItem(GetHwnd(), tvItem) )

     {
         wxLogLastError("TreeView_GetItem");
 
     {
         wxLogLastError("TreeView_GetItem");
 


@@ -198,7 +296,7 @@ bool wxTreeCtrl::DoGetItem(wxTreeViewItem* tvItem) const
 
 void wxTreeCtrl::DoSetItem(wxTreeViewItem* tvItem)
 {
 
 void wxTreeCtrl::DoSetItem(wxTreeViewItem* tvItem)
 {

-    if ( TreeView_SetItem(wxhWnd, tvItem) == -1 )
+    if ( TreeView_SetItem(GetHwnd(), tvItem) == -1 )

     {
         wxLogLastError("TreeView_SetItem");
     }
     {
         wxLogLastError("TreeView_SetItem");
     }


@@ -206,17 +304,17 @@ void wxTreeCtrl::DoSetItem(wxTreeViewItem* tvItem)
 
 size_t wxTreeCtrl::GetCount() const
 {
 
 size_t wxTreeCtrl::GetCount() const
 {

-    return (size_t)TreeView_GetCount(wxhWnd);
+    return (size_t)TreeView_GetCount(GetHwnd());

 }
 
 unsigned int wxTreeCtrl::GetIndent() const
 {
 }
 
 unsigned int wxTreeCtrl::GetIndent() const
 {

-    return TreeView_GetIndent(wxhWnd);
+    return TreeView_GetIndent(GetHwnd());

 }
 
 void wxTreeCtrl::SetIndent(unsigned int indent)
 {
 }
 
 void wxTreeCtrl::SetIndent(unsigned int indent)
 {

-    TreeView_SetIndent(wxhWnd, indent);
+    TreeView_SetIndent(GetHwnd(), indent);

 }
 
 wxImageList *wxTreeCtrl::GetImageList() const
 }
 
 wxImageList *wxTreeCtrl::GetImageList() const


@@ -232,7 +330,7 @@ wxImageList *wxTreeCtrl::GetStateImageList() const
 void wxTreeCtrl::SetAnyImageList(wxImageList *imageList, int which)
 {
     // no error return
 void wxTreeCtrl::SetAnyImageList(wxImageList *imageList, int which)
 {
     // no error return

-    TreeView_SetImageList(wxhWnd,
+    TreeView_SetImageList(GetHwnd(),

                           imageList ? imageList->GetHIMAGELIST() : 0,
                           which);
 }
                           imageList ? imageList->GetHIMAGELIST() : 0,
                           which);
 }


@@ -247,29 +345,36 @@ void wxTreeCtrl::SetStateImageList(wxImageList *imageList)
     SetAnyImageList(m_imageListState = imageList, TVSIL_STATE);
 }
 
     SetAnyImageList(m_imageListState = imageList, TVSIL_STATE);
 }
 

-size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
+size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
+                                    bool recursively) const

 {
 {

-    long cookie;
+    class TraverseCounter : public wxTreeTraversal
+    {
+    public:
+        TraverseCounter(const wxTreeCtrl *tree,
+                        const wxTreeItemId& root,
+                        bool recursively)
+            : wxTreeTraversal(tree)
+            {
+                m_count = 0;

 
 

-    size_t result = 0;
+                DoTraverse(root, recursively);
+            }

 
 

-    wxArrayLong children;
-    wxTreeItemId child = GetFirstChild(item, cookie);
-    while ( child.IsOk() )
-    {
-        if ( recursively )
+        virtual bool OnVisit(const wxTreeItemId& item)

         {
         {

-            // recursive call
-            result += GetChildrenCount(child, TRUE);
+            m_count++;
+
+            return TRUE;

         }
 
         }
 

-        // add the child to the result in any case
-        result++;
+        size_t GetCount() const { return m_count; }

 
 

-        child = GetNextChild(item, cookie);
-    }
+    private:
+        size_t m_count;
+    } counter(this, item, recursively);

 
 

-    return result;
+    return counter.GetCount();

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


@@ -278,7 +383,7 @@ size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item, bool recursively)
 
 wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {
 
 wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {

-    char buf[512];  // the size is arbitrary...
+    wxChar buf[512];  // the size is arbitrary...

 
     wxTreeViewItem tvItem(item, TVIF_TEXT);
     tvItem.pszText = buf;
 
     wxTreeViewItem tvItem(item, TVIF_TEXT);
     tvItem.pszText = buf;


@@ -286,7 +391,7 @@ wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
     if ( !DoGetItem(&tvItem) )
     {
         // don't return some garbage which was on stack, but an empty string
     if ( !DoGetItem(&tvItem) )
     {
         // don't return some garbage which was on stack, but an empty string

-        buf[0] = '\0';
+        buf[0] = _T('\0');

     }
 
     return wxString(buf);
     }
 
     return wxString(buf);


@@ -295,7 +400,17 @@ wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
 {
     wxTreeViewItem tvItem(item, TVIF_TEXT);
 void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
 {
     wxTreeViewItem tvItem(item, TVIF_TEXT);

-    tvItem.pszText = (char *)text.c_str();  // conversion is ok
+    tvItem.pszText = (wxChar *)text.c_str();  // conversion is ok
+    DoSetItem(&tvItem);
+}
+
+void wxTreeCtrl::DoSetItemImages(const wxTreeItemId& item,
+                                 int image,
+                                 int imageSel)
+{
+    wxTreeViewItem tvItem(item, TVIF_IMAGE | TVIF_SELECTEDIMAGE);
+    tvItem.iSelectedImage = imageSel;
+    tvItem.iImage = image;

     DoSetItem(&tvItem);
 }
 
     DoSetItem(&tvItem);
 }
 


@@ -309,9 +424,10 @@ int wxTreeCtrl::GetItemImage(const wxTreeItemId& item) const
 
 void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
 {
 
 void wxTreeCtrl::SetItemImage(const wxTreeItemId& item, int image)
 {

-    wxTreeViewItem tvItem(item, TVIF_IMAGE);
-    tvItem.iImage = image;
-    DoSetItem(&tvItem);
+    // 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, image, GetItemSelectedImage(item));

 }
 
 int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
 }
 
 int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const


@@ -324,9 +440,10 @@ int wxTreeCtrl::GetItemSelectedImage(const wxTreeItemId& item) const
 
 void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
 {
 
 void wxTreeCtrl::SetItemSelectedImage(const wxTreeItemId& item, int image)
 {

-    wxTreeViewItem tvItem(item, TVIF_SELECTEDIMAGE);
-    tvItem.iSelectedImage = image;
-    DoSetItem(&tvItem);
+    // 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, GetItemImage(item), image);

 }
 
 wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
 }
 
 wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const


@@ -376,7 +493,7 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
 {
     // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect
     RECT rect;
 {
     // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect
     RECT rect;

-    return SendMessage(wxhWnd, TVM_GETITEMRECT, FALSE, (LPARAM)&rect) != 0;
+    return SendMessage(GetHwnd(), TVM_GETITEMRECT, FALSE, (LPARAM)&rect) != 0;

 
 }
 
 
 }
 


@@ -421,24 +538,27 @@ bool wxTreeCtrl::IsBold(const wxTreeItemId& item) const
 
 wxTreeItemId wxTreeCtrl::GetRootItem() const
 {
 
 wxTreeItemId wxTreeCtrl::GetRootItem() const
 {

-    return wxTreeItemId((WXHTREEITEM) TreeView_GetRoot(wxhWnd));
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetRoot(GetHwnd()));

 }
 
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {
 }
 
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {

-    return wxTreeItemId((WXHTREEITEM) TreeView_GetSelection(wxhWnd));
+    wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), (WXHTREEITEM)0,
+                 _T("this only works with single selection controls") );
+
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetSelection(GetHwnd()));

 }
 
 wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
 {
 }
 
 wxTreeItemId wxTreeCtrl::GetParent(const wxTreeItemId& item) const
 {

-    return wxTreeItemId((WXHTREEITEM) TreeView_GetParent(wxhWnd, (HTREEITEM) (WXHTREEITEM) item));
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetParent(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));

 }
 
 wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
                                        long& _cookie) const
 {
     // remember the last child returned in 'cookie'
 }
 
 wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
                                        long& _cookie) const
 {
     // remember the last child returned in 'cookie'

-    _cookie = (long)TreeView_GetChild(wxhWnd, (HTREEITEM) (WXHTREEITEM)item);
+    _cookie = (long)TreeView_GetChild(GetHwnd(), (HTREEITEM) (WXHTREEITEM)item);

 
     return wxTreeItemId((WXHTREEITEM)_cookie);
 }
 
     return wxTreeItemId((WXHTREEITEM)_cookie);
 }


@@ -446,7 +566,7 @@ wxTreeItemId wxTreeCtrl::GetFirstChild(const wxTreeItemId& item,
 wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
                                       long& _cookie) const
 {
 wxTreeItemId wxTreeCtrl::GetNextChild(const wxTreeItemId& WXUNUSED(item),
                                       long& _cookie) const
 {

-    wxTreeItemId l = wxTreeItemId((WXHTREEITEM)TreeView_GetNextSibling(wxhWnd,
+    wxTreeItemId l = wxTreeItemId((WXHTREEITEM)TreeView_GetNextSibling(GetHwnd(),

                                    (HTREEITEM)(WXHTREEITEM)_cookie));
     _cookie = (long)l;
 
                                    (HTREEITEM)(WXHTREEITEM)_cookie));
     _cookie = (long)l;
 


@@ -471,33 +591,89 @@ wxTreeItemId wxTreeCtrl::GetLastChild(const wxTreeItemId& item) const
 
 wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
 {
 
 wxTreeItemId wxTreeCtrl::GetNextSibling(const wxTreeItemId& item) const
 {

-    return wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(wxhWnd, (HTREEITEM) (WXHTREEITEM) item));
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));

 }
 
 wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
 {
 }
 
 wxTreeItemId wxTreeCtrl::GetPrevSibling(const wxTreeItemId& item) const
 {

-    return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevSibling(wxhWnd, (HTREEITEM) (WXHTREEITEM) item));
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevSibling(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));

 }
 
 wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
 {
 }
 
 wxTreeItemId wxTreeCtrl::GetFirstVisibleItem() const
 {

-    return wxTreeItemId((WXHTREEITEM) TreeView_GetFirstVisible(wxhWnd));
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetFirstVisible(GetHwnd()));

 }
 
 wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {
 }
 
 wxTreeItemId wxTreeCtrl::GetNextVisible(const wxTreeItemId& item) const
 {

-    wxASSERT_MSG( IsVisible(item), "The item you call GetNextVisible() "
-                                   "for must be visible itself!");
+    wxASSERT_MSG( IsVisible(item), _T("The item you call GetNextVisible() "
+                                      "for must be visible itself!"));

 
 

-    return wxTreeItemId((WXHTREEITEM) TreeView_GetNextVisible(wxhWnd, (HTREEITEM) (WXHTREEITEM) item));
+    return wxTreeItemId((WXHTREEITEM) TreeView_GetNextVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item));

 }
 
 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 {
 }
 
 wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 {

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

 
 

-    return wxTreeItemId((WXHTREEITEM) TreeView_GetPrevVisible(wxhWnd, (HTREEITEM) (WXHTREEITEM) 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);
+
+    // state image indices are 1 based
+    return ((tvItem.state >> 12) - 1) == 1;
+}
+
+void wxTreeCtrl::SetItemCheck(const wxTreeItemId& item, bool check)
+{
+    // receive the desired information.
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
+
+    // state images are one-based
+    tvItem.state = (check ? 2 : 1) << 12;
+
+    DoSetItem(&tvItem);
+}
+
+size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds& selections) const
+{
+    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;
+    } selector(this, selections);
+
+    return selections.GetCount();

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


@@ -524,7 +700,7 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
     if ( !text.IsEmpty() )
     {
         mask |= TVIF_TEXT;
     if ( !text.IsEmpty() )
     {
         mask |= TVIF_TEXT;

-        tvIns.item.pszText = (char *)text.c_str();  // cast is ok
+        tvIns.item.pszText = (wxChar *)text.c_str();  // cast is ok

     }
 
     if ( image != -1 )
     }
 
     if ( image != -1 )


@@ -553,7 +729,7 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
 
     tvIns.item.mask = mask;
 
 
     tvIns.item.mask = mask;
 

-    HTREEITEM id = (HTREEITEM) TreeView_InsertItem(wxhWnd, &tvIns);
+    HTREEITEM id = (HTREEITEM) TreeView_InsertItem(GetHwnd(), &tvIns);

     if ( id == 0 )
     {
         wxLogLastError("TreeView_InsertItem");
     if ( id == 0 )
     {
         wxLogLastError("TreeView_InsertItem");


@@ -615,7 +791,7 @@ wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent,
 
 void wxTreeCtrl::Delete(const wxTreeItemId& item)
 {
 
 void wxTreeCtrl::Delete(const wxTreeItemId& item)
 {

-    if ( !TreeView_DeleteItem(wxhWnd, (HTREEITEM)(WXHTREEITEM)item) )
+    if ( !TreeView_DeleteItem(GetHwnd(), (HTREEITEM)(WXHTREEITEM)item) )

     {
         wxLogLastError("TreeView_DeleteItem");
     }
     {
         wxLogLastError("TreeView_DeleteItem");
     }


@@ -638,7 +814,7 @@ void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
     size_t nCount = children.Count();
     for ( size_t n = 0; n < nCount; n++ )
     {
     size_t nCount = children.Count();
     for ( size_t n = 0; n < nCount; n++ )
     {

-        if ( !TreeView_DeleteItem(wxhWnd, (HTREEITEM)children[n]) )
+        if ( !TreeView_DeleteItem(GetHwnd(), (HTREEITEM)children[n]) )

         {
             wxLogLastError("TreeView_DeleteItem");
         }
         {
             wxLogLastError("TreeView_DeleteItem");
         }


@@ -647,7 +823,7 @@ void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
 
 void wxTreeCtrl::DeleteAllItems()
 {
 
 void wxTreeCtrl::DeleteAllItems()
 {

-    if ( !TreeView_DeleteAllItems(wxhWnd) )
+    if ( !TreeView_DeleteAllItems(GetHwnd()) )

     {
         wxLogLastError("TreeView_DeleteAllItems");
     }
     {
         wxLogLastError("TreeView_DeleteAllItems");
     }


@@ -659,11 +835,21 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
                   flag == (TVE_COLLAPSE | TVE_COLLAPSERESET) ||
                   flag == TVE_EXPAND   ||
                   flag == TVE_TOGGLE,
                   flag == (TVE_COLLAPSE | TVE_COLLAPSERESET) ||
                   flag == TVE_EXPAND   ||
                   flag == TVE_TOGGLE,

-                  "Unknown flag in wxTreeCtrl::DoExpand" );
+                  _T("Unknown flag in wxTreeCtrl::DoExpand") );

 
     // TreeView_Expand doesn't send TVN_ITEMEXPAND(ING) messages, so we must
 
     // TreeView_Expand doesn't send TVN_ITEMEXPAND(ING) messages, so we must

-    // emulate them
-    if ( TreeView_Expand(wxhWnd, (HTREEITEM) (WXHTREEITEM) item, flag) != 0 )
+    // 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;
     {
         wxTreeEvent event(wxEVT_NULL, m_windowId);
         event.m_item = item;


@@ -672,18 +858,14 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
 
         event.SetEventObject(this);
 
 
         event.SetEventObject(this);
 

-        // @@@ return values of {EXPAND|COLLAPS}ING event handler is discarded
+        // 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);
     }
         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.");
-    }
+    //else: change didn't took place, so do nothing at all

 }
 
 void wxTreeCtrl::Expand(const wxTreeItemId& item)
 }
 
 void wxTreeCtrl::Expand(const wxTreeItemId& item)


@@ -708,31 +890,78 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item)
 
 void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
 {
 
 void wxTreeCtrl::ExpandItem(const wxTreeItemId& item, int action)
 {

-       DoExpand(item, action);
+    DoExpand(item, action);

 }
 
 void wxTreeCtrl::Unselect()
 {
 }
 
 void wxTreeCtrl::Unselect()
 {

+    wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE), _T("doesn't make sense") );
+
+    // just remove the selection

     SelectItem(wxTreeItemId((WXHTREEITEM) 0));
 }
 
     SelectItem(wxTreeItemId((WXHTREEITEM) 0));
 }
 

+void wxTreeCtrl::UnselectAll()
+{
+    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
+    {
+        // just remove the selection
+        Unselect();
+    }
+}
+

 void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
 {
 void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
 {

-    if ( !TreeView_SelectItem(wxhWnd, (HTREEITEM) (WXHTREEITEM) item) )
+    if ( m_windowStyle & wxTR_MULTIPLE )

     {
     {

-        wxLogLastError("TreeView_SelectItem");
+        // 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

     }
 }
 
 void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 {
     // no error return
     }
 }
 
 void wxTreeCtrl::EnsureVisible(const wxTreeItemId& item)
 {
     // no error return

-    TreeView_EnsureVisible(wxhWnd, (HTREEITEM) (WXHTREEITEM) item);
+    TreeView_EnsureVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item);

 }
 
 void wxTreeCtrl::ScrollTo(const wxTreeItemId& item)
 {
 }
 
 void wxTreeCtrl::ScrollTo(const wxTreeItemId& item)
 {

-    if ( !TreeView_SelectSetFirstVisible(wxhWnd, (HTREEITEM) (WXHTREEITEM) item) )
+    if ( !TreeView_SelectSetFirstVisible(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item) )

     {
         wxLogLastError("TreeView_SelectSetFirstVisible");
     }
     {
         wxLogLastError("TreeView_SelectSetFirstVisible");
     }


@@ -759,9 +988,14 @@ wxTextCtrl* wxTreeCtrl::EditLabel(const wxTreeItemId& item,
 {
     wxASSERT( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)) );
 
 {
     wxASSERT( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)) );
 

-    HWND hWnd = (HWND) TreeView_EditLabel(wxhWnd, (HTREEITEM) (WXHTREEITEM) item);
+    HWND hWnd = (HWND) TreeView_EditLabel(GetHwnd(), (HTREEITEM) (WXHTREEITEM) item);

 
 

-    wxCHECK_MSG( hWnd, NULL, "Can't edit tree ctrl label" );
+    // this is not an error - the TVN_BEGINLABELEDIT handler might have
+    // returned FALSE
+    if ( !hWnd )
+    {
+        return NULL;
+    }

 
     DeleteTextCtrl();
 
 
     DeleteTextCtrl();
 


@@ -775,7 +1009,7 @@ wxTextCtrl* wxTreeCtrl::EditLabel(const wxTreeItemId& item,
 // End label editing, optionally cancelling the edit
 void wxTreeCtrl::EndEditLabel(const wxTreeItemId& item, bool discardChanges)
 {
 // End label editing, optionally cancelling the edit
 void wxTreeCtrl::EndEditLabel(const wxTreeItemId& item, bool discardChanges)
 {

-    TreeView_EndEditLabelNow(wxhWnd, discardChanges);
+    TreeView_EndEditLabelNow(GetHwnd(), discardChanges);

 
     DeleteTextCtrl();
 }
 
     DeleteTextCtrl();
 }


@@ -786,7 +1020,7 @@ wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
     hitTestInfo.pt.x = (int)point.x;
     hitTestInfo.pt.y = (int)point.y;
 
     hitTestInfo.pt.x = (int)point.x;
     hitTestInfo.pt.y = (int)point.y;
 

-    TreeView_HitTest(wxhWnd, &hitTestInfo);
+    TreeView_HitTest(GetHwnd(), &hitTestInfo);

 
     flags = 0;
 
 
     flags = 0;
 


@@ -816,7 +1050,7 @@ bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
                                  bool textOnly) const
 {
     RECT rc;
                                  bool textOnly) const
 {
     RECT rc;

-    if ( TreeView_GetItemRect(wxhWnd, (HTREEITEM)(WXHTREEITEM)item,
+    if ( TreeView_GetItemRect(GetHwnd(), (HTREEITEM)(WXHTREEITEM)item,

                               &rc, textOnly) )
     {
         rect = wxRect(wxPoint(rc.left, rc.top), wxPoint(rc.right, rc.bottom));
                               &rc, textOnly) )
     {
         rect = wxRect(wxPoint(rc.left, rc.top), wxPoint(rc.right, rc.bottom));


@@ -847,7 +1081,7 @@ static int CALLBACK TreeView_CompareCallback(wxTreeItemData *pItem1,
 int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
                                const wxTreeItemId& item2)
 {
 int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
                                const wxTreeItemId& item2)
 {

-    return strcmp(GetItemText(item1), GetItemText(item2));
+    return wxStrcmp(GetItemText(item1), GetItemText(item2));

 }
 
 void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
 }
 
 void wxTreeCtrl::SortChildren(const wxTreeItemId& item)


@@ -857,7 +1091,7 @@ void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
     // directly if we're not in derived class (much more efficient!)
     if ( GetClassInfo() == CLASSINFO(wxTreeCtrl) )
     {
     // directly if we're not in derived class (much more efficient!)
     if ( GetClassInfo() == CLASSINFO(wxTreeCtrl) )
     {

-        TreeView_SortChildren(wxhWnd, (HTREEITEM)(WXHTREEITEM)item, 0);
+        TreeView_SortChildren(GetHwnd(), (HTREEITEM)(WXHTREEITEM)item, 0);

     }
     else
     {
     }
     else
     {


@@ -865,7 +1099,7 @@ void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
         tvSort.hParent = (HTREEITEM)(WXHTREEITEM)item;
         tvSort.lpfnCompare = (PFNTVCOMPARE)TreeView_CompareCallback;
         tvSort.lParam = (LPARAM)this;
         tvSort.hParent = (HTREEITEM)(WXHTREEITEM)item;
         tvSort.lpfnCompare = (PFNTVCOMPARE)TreeView_CompareCallback;
         tvSort.lParam = (LPARAM)this;

-        TreeView_SortChildrenCB(wxhWnd, &tvSort, 0 /* reserved */);
+        TreeView_SortChildrenCB(GetHwnd(), &tvSort, 0 /* reserved */);

     }
 }
 
     }
 }
 


@@ -929,6 +1163,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 event.m_item = (WXHTREEITEM) info->item.hItem;
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 event.m_item = (WXHTREEITEM) info->item.hItem;

+                event.m_label = info->item.pszText;

                 break;
             }
 
                 break;
             }
 


@@ -946,7 +1181,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 eventType = wxEVT_COMMAND_TREE_END_LABEL_EDIT;
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 eventType = wxEVT_COMMAND_TREE_END_LABEL_EDIT;
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 

-                event.m_item = (WXHTREEITEM) info->item.hItem;
+                event.m_item = (WXHTREEITEM)info->item.hItem;
+                event.m_label = info->item.pszText;

                 break;
             }
 
                 break;
             }
 


@@ -986,8 +1222,8 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         break;
 
                     default:
                         break;
 
                     default:

-                        wxLogDebug("unexpected code %d in TVN_ITEMEXPAND "
-                                   "message", tv->action);
+                        wxLogDebug(_T("unexpected code %d in TVN_ITEMEXPAND "
+                                      "message"), tv->action);

                 }
 
                 bool ing = (hdr->code == TVN_ITEMEXPANDING);
                 }
 
                 bool ing = (hdr->code == TVN_ITEMEXPANDING);


@@ -1043,18 +1279,46 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     bool processed = GetEventHandler()->ProcessEvent(event);
 
     // post processing
     bool processed = GetEventHandler()->ProcessEvent(event);
 
     // post processing

-    if ( hdr->code == TVN_DELETEITEM )
+    switch ( hdr->code )

     {
     {

-        // 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
-    }
+        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;
+                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();

 
 

-    *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;
+
+        //default:
+            // for the other messages the return value is ignored and there is
+            // nothing special to do
+    }

 
     return processed;
 }
 
     return processed;
 }