Added test for wxUSE_STATLINE in statline.cpp

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 42b81f076008b59337848259f1731c19e42fd9fc..028f749428fe8ef377fa95e542b69c6b348ae3ac 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -27,34 +27,36 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#ifndef WX_PRECOMP
-    #include "wx.h"
-#endif
-
-#if defined(__WIN95__)
-
-#include "wx/log.h"
-#include "wx/imaglist.h"
-
+#include "wx/window.h"

 #include "wx/msw/private.h"
 
 #include "wx/msw/private.h"
 

-#ifndef __GNUWIN32__
-    #include <commctrl.h>
+#ifndef WX_PRECOMP
+    #include "wx/settings.h"

 #endif
 
 #endif
 

+// Mingw32 is a bit mental even though this is done in winundef

 #ifdef GetFirstChild
 #ifdef GetFirstChild

-#undef GetFirstChild
+    #undef GetFirstChild

 #endif
 
 #endif
 

-#ifdef GetNextChild
-#undef GetNextChild
+#ifdef GetNextSibling
+    #undef GetNextSibling

 #endif
 
 #endif
 

-#ifdef GetNextSibling
-#undef GetNextSibling
+#if defined(__WIN95__)
+
+#include "wx/log.h"
+#include "wx/dynarray.h"
+#include "wx/imaglist.h"
+#include "wx/msw/treectrl.h"
+
+#ifdef __GNUWIN32__
+#include "wx/msw/gnuwin32/extra.h"

 #endif
 
 #endif
 

-#include "wx/treectrl.h"
+#if (defined(__WIN95__) && !defined(__GNUWIN32__)) || defined(__TWIN32__)
+    #include <commctrl.h>
+#endif

 
 // Bug in headers, sometimes
 #ifndef TVIS_FOCUSED
 
 // Bug in headers, sometimes
 #ifndef TVIS_FOCUSED


@@ -85,9 +87,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
 // ----------------------------------------------------------------------------


@@ -132,7 +131,8 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
 
     m_windowId = (id == -1) ? NewControlId() : id;
 
 
     m_windowId = (id == -1) ? NewControlId() : id;
 

-    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES;
+    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_SHOWSELALWAYS ;
+

 
     bool want3D;
     WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
 
     bool want3D;
     WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;


@@ -158,7 +158,7 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
                        (
                         exStyle,
                         WC_TREEVIEW,
                        (
                         exStyle,
                         WC_TREEVIEW,

-                        "",
+                        _T(""),

                         wstyle,
                         pos.x, pos.y, size.x, size.y,
                         (HWND)parent->GetHWND(),
                         wstyle,
                         pos.x, pos.y, size.x, size.y,
                         (HWND)parent->GetHWND(),


@@ -167,7 +167,7 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
                         NULL
                        );
 
                         NULL
                        );
 

-    wxCHECK_MSG( m_hWnd, FALSE, "Failed to create tree ctrl" );
+    wxCHECK_MSG( m_hWnd, FALSE, _T("Failed to create tree ctrl") );

 
     if ( parent )
         parent->AddChild(this);
 
     if ( parent )
         parent->AddChild(this);


@@ -193,7 +193,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");
 


@@ -205,7 +205,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");
     }


@@ -213,17 +213,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


@@ -239,7 +239,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);
 }


@@ -254,13 +254,38 @@ 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)
+{
+    long cookie;
+
+    size_t result = 0;
+
+    wxArrayLong children;
+    wxTreeItemId child = GetFirstChild(item, cookie);
+    while ( child.IsOk() )
+    {
+        if ( recursively )
+        {
+            // recursive call
+            result += GetChildrenCount(child, TRUE);
+        }
+
+        // add the child to the result in any case
+        result++;
+
+        child = GetNextChild(item, cookie);
+    }
+
+    return result;
+}
+

 // ----------------------------------------------------------------------------
 // Item access
 // ----------------------------------------------------------------------------
 
 wxString wxTreeCtrl::GetItemText(const wxTreeItemId& item) const
 {
 // ----------------------------------------------------------------------------
 // Item access
 // ----------------------------------------------------------------------------
 
 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;


@@ -268,7 +293,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);


@@ -277,7 +302,7 @@ 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);
 }
 
     DoSetItem(&tvItem);
 }
 


@@ -336,16 +361,29 @@ void wxTreeCtrl::SetItemHasChildren(const wxTreeItemId& item, bool has)
     DoSetItem(&tvItem);
 }
 
     DoSetItem(&tvItem);
 }
 

+void wxTreeCtrl::SetItemBold(const wxTreeItemId& item, bool bold)
+{
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_BOLD);
+    tvItem.state = bold ? TVIS_BOLD : 0;
+    DoSetItem(&tvItem);
+}
+
+void wxTreeCtrl::SetItemDropHighlight(const wxTreeItemId& item, bool highlight)
+{
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_DROPHILITED);
+    tvItem.state = highlight ? TVIS_DROPHILITED : 0;
+    DoSetItem(&tvItem);
+}
+

 // ----------------------------------------------------------------------------
 // Item status
 // ----------------------------------------------------------------------------
 
 bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
 {
 // ----------------------------------------------------------------------------
 // Item status
 // ----------------------------------------------------------------------------
 
 bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
 {

+    // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect

     RECT rect;
     RECT rect;

-//    return (TreeView_GetItemRect(wxhWnd, (HTREEITEM) (WXHTREEITEM)item, &rect, FALSE) != 0);
-    // Bug in Gnu-Win32 headers, so don't use the macro.
-    return (SendMessage((wxhWnd), TVM_GETITEMRECT, (WPARAM) FALSE, (LPARAM) & rect) != 0);
+    return SendMessage(GetHwnd(), TVM_GETITEMRECT, FALSE, (LPARAM)&rect) != 0;

 
 }
 
 
 }
 


@@ -376,30 +414,38 @@ bool wxTreeCtrl::IsSelected(const wxTreeItemId& item) const
     return (tvItem.state & TVIS_SELECTED) != 0;
 }
 
     return (tvItem.state & TVIS_SELECTED) != 0;
 }
 

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


@@ -407,39 +453,58 @@ 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
 {

-    return wxTreeItemId((WXHTREEITEM) TreeView_GetNextSibling(wxhWnd,
-                                                    (HTREEITEM) (WXHTREEITEM)_cookie));
+    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
 {
 }
 
 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));

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


@@ -455,11 +520,18 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
     TV_INSERTSTRUCT tvIns;
     tvIns.hParent = (HTREEITEM) (WXHTREEITEM)parent;
     tvIns.hInsertAfter = (HTREEITEM) (WXHTREEITEM) hInsertAfter;
     TV_INSERTSTRUCT tvIns;
     tvIns.hParent = (HTREEITEM) (WXHTREEITEM)parent;
     tvIns.hInsertAfter = (HTREEITEM) (WXHTREEITEM) hInsertAfter;

+
+    // This is how we insert the item as the first child: supply a NULL hInsertAfter
+    if (tvIns.hInsertAfter == (HTREEITEM) 0)
+    {
+        tvIns.hInsertAfter = TVI_FIRST;
+    }
+

     UINT mask = 0;
     if ( !text.IsEmpty() )
     {
         mask |= TVIF_TEXT;
     UINT mask = 0;
     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 )


@@ -467,7 +539,7 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
         mask |= TVIF_IMAGE;
         tvIns.item.iImage = image;
 
         mask |= TVIF_IMAGE;
         tvIns.item.iImage = image;
 

-        if ( selectedImage = -1 )
+        if ( selectedImage == -1 )

         {
             // take the same image for selected icon if not specified
             selectedImage = image;
         {
             // take the same image for selected icon if not specified
             selectedImage = image;


@@ -488,12 +560,18 @@ 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");
     }
 

+    if ( data != NULL )
+    {
+        // associate the application tree item with Win32 tree item handle
+        data->SetId((WXHTREEITEM)id);
+    }
+

     return wxTreeItemId((WXHTREEITEM)id);
 }
 
     return wxTreeItemId((WXHTREEITEM)id);
 }
 


@@ -544,19 +622,39 @@ wxTreeItemId wxTreeCtrl::AppendItem(const wxTreeItemId& parent,
 
 void wxTreeCtrl::Delete(const wxTreeItemId& item)
 {
 
 void wxTreeCtrl::Delete(const wxTreeItemId& item)
 {

-    wxTreeItemData *data = GetItemData(item);
-       if(data!=NULL)
-               delete data;    // may be NULL, ok
-
-    if ( !TreeView_DeleteItem(wxhWnd, (HTREEITEM)(WXHTREEITEM)item) )
+    if ( !TreeView_DeleteItem(GetHwnd(), (HTREEITEM)(WXHTREEITEM)item) )

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

+// delete all children (but don't delete the item itself)
+void wxTreeCtrl::DeleteChildren(const wxTreeItemId& item)
+{
+    long cookie;
+
+    wxArrayLong children;
+    wxTreeItemId child = GetFirstChild(item, cookie);
+    while ( child.IsOk() )
+    {
+        children.Add((long)(WXHTREEITEM)child);
+
+        child = GetNextChild(item, cookie);
+    }
+
+    size_t nCount = children.Count();
+    for ( size_t n = 0; n < nCount; n++ )
+    {
+        if ( !TreeView_DeleteItem(GetHwnd(), (HTREEITEM)children[n]) )
+        {
+            wxLogLastError("TreeView_DeleteItem");
+        }
+    }
+}
+

 void wxTreeCtrl::DeleteAllItems()
 {
 void wxTreeCtrl::DeleteAllItems()
 {

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

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


@@ -564,13 +662,25 @@ void wxTreeCtrl::DeleteAllItems()
 
 void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
 {
 
 void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
 {

-    wxASSERT_MSG( flag == TVE_COLLAPSE || flag == TVE_COLLAPSERESET ||
-                  flag == TVE_EXPAND   || flag == TVE_TOGGLE,
-                  "Unknown flag in wxTreeCtrl::DoExpand" );
+    wxASSERT_MSG( flag == TVE_COLLAPSE ||
+                  flag == (TVE_COLLAPSE | TVE_COLLAPSERESET) ||
+                  flag == TVE_EXPAND   ||
+                  flag == TVE_TOGGLE,
+                  _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;


@@ -579,18 +689,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)


@@ -605,7 +711,7 @@ void wxTreeCtrl::Collapse(const wxTreeItemId& item)
 
 void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item)
 {
 
 void wxTreeCtrl::CollapseAndReset(const wxTreeItemId& item)
 {

-    DoExpand(item, TVE_COLLAPSERESET);
+    DoExpand(item, TVE_COLLAPSE | TVE_COLLAPSERESET);

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


@@ -625,21 +731,39 @@ void wxTreeCtrl::Unselect()
 
 void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
 {
 
 void wxTreeCtrl::SelectItem(const wxTreeItemId& item)
 {

-    if ( !TreeView_SelectItem(wxhWnd, (HTREEITEM) (WXHTREEITEM) item) )
+    // 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() )

     {
     {

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


@@ -666,9 +790,9 @@ 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" );
+    wxCHECK_MSG( hWnd, NULL, _T("Can't edit tree ctrl label") );

 
     DeleteTextCtrl();
 
 
     DeleteTextCtrl();
 


@@ -682,7 +806,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();
 }


@@ -693,7 +817,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;
 


@@ -718,17 +842,61 @@ wxTreeItemId wxTreeCtrl::HitTest(const wxPoint& point, int& flags)
     return wxTreeItemId((WXHTREEITEM) hitTestInfo.hItem);
 }
 
     return wxTreeItemId((WXHTREEITEM) hitTestInfo.hItem);
 }
 

-void wxTreeCtrl::SortChildren(const wxTreeItemId& item,
-                              wxTreeItemCmpFunc *cmpFunction)
+bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
+                                 wxRect& rect,
+                                 bool textOnly) const
+{
+    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;
+    }
+}
+
+// ----------------------------------------------------------------------------
+// sorting stuff
+// ----------------------------------------------------------------------------
+
+static int CALLBACK TreeView_CompareCallback(wxTreeItemData *pItem1,
+                                             wxTreeItemData *pItem2,
+                                             wxTreeCtrl *tree)
+{
+    wxCHECK_MSG( pItem1 && pItem2, 0,
+                 _T("sorting tree without data doesn't make sense") );
+
+    return tree->OnCompareItems(pItem1->GetId(), pItem2->GetId());
+}
+
+int wxTreeCtrl::OnCompareItems(const wxTreeItemId& item1,
+                               const wxTreeItemId& item2)

 {
 {

-    if ( cmpFunction == NULL )
+    return wxStrcmp(GetItemText(item1), GetItemText(item2));
+}
+
+void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
+{
+    // rely on the fact that TreeView_SortChildren does the same thing as our
+    // default behaviour, i.e. sorts items alphabetically and so call it
+    // directly if we're not in derived class (much more efficient!)
+    if ( GetClassInfo() == CLASSINFO(wxTreeCtrl) )

     {
     {

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

     }
     else
     {
     }
     else
     {

-        // TODO: use TreeView_SortChildrenCB
-        wxFAIL_MSG("wxTreeCtrl::SortChildren not implemented");
+        TV_SORTCB tvSort;
+        tvSort.hParent = (HTREEITEM)(WXHTREEITEM)item;
+        tvSort.lpfnCompare = (PFNTVCOMPARE)TreeView_CompareCallback;
+        tvSort.lParam = (LPARAM)this;
+        TreeView_SortChildrenCB(GetHwnd(), &tvSort, 0 /* reserved */);

     }
 }
 
     }
 }
 


@@ -761,7 +929,7 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id)
 }
 
 // process WM_NOTIFY Windows message
 }
 
 // process WM_NOTIFY Windows message

-bool wxTreeCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
+bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)

 {
     wxTreeEvent event(wxEVT_NULL, m_windowId);
     wxEventType eventType = wxEVT_NULL;
 {
     wxTreeEvent event(wxEVT_NULL, m_windowId);
     wxEventType eventType = wxEVT_NULL;


@@ -849,8 +1017,8 @@ bool wxTreeCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
                         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);


@@ -866,6 +1034,16 @@ bool wxTreeCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
                 TV_KEYDOWN *info = (TV_KEYDOWN *)lParam;
 
                 event.m_code = wxCharCodeMSWToWX(info->wVKey);
                 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;
             }
 
                 break;
             }
 


@@ -887,46 +1065,39 @@ bool wxTreeCtrl::MSWNotify(WXWPARAM wParam, WXLPARAM lParam)
             }
 
         default:
             }
 
         default:

-            return wxControl::MSWNotify(wParam, lParam);
+            return wxControl::MSWOnNotify(idCtrl, lParam, result);

     }
 
     event.SetEventObject(this);
     event.SetEventType(eventType);
 
     }
 
     event.SetEventObject(this);
     event.SetEventType(eventType);
 

-    bool rc = GetEventHandler()->ProcessEvent(event);
+    bool processed = GetEventHandler()->ProcessEvent(event);

 
     // post processing
 
     // post processing

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

     {
         // NB: we might process this message using wxWindows event tables, but
         //     due to overhead of wxWin event system we prefer to do it here
         //     (otherwise deleting a tree with many items is just too slow)
     {
         // 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)

-        case TVN_DELETEITEM:
-            {
-                NM_TREEVIEW* tv = (NM_TREEVIEW *)lParam;
-                wxTreeItemData *data = (wxTreeItemData *)tv->itemOld.lParam;
-                delete data; // may be NULL, ok
-            }
-            break;
-
-        case TVN_ITEMEXPANDING:
-            // if user called Veto(), don't allow expansion/collapse by
-            // returning TRUE from here
-            rc = event.m_code != 0;
-            break;
+        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

     }
 
     }
 

-    return rc;
+    *result = !event.IsAllowed();
+
+    return processed;

 }
 
 // ----------------------------------------------------------------------------
 // Tree event
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // Tree event
 // ----------------------------------------------------------------------------
 

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

 
 wxTreeEvent::wxTreeEvent(wxEventType commandType, int id)
 
 wxTreeEvent::wxTreeEvent(wxEventType commandType, int id)

-           : wxCommandEvent(commandType, id)
+           : wxNotifyEvent(commandType, id)

 {
     m_code = 0;
     m_itemOld = 0;
 {
     m_code = 0;
     m_itemOld = 0;