missing commit

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 3093583d52ad26a2a4852699c2211ab5fc47f431..191a26fc00a3d259728dd7443bb8cfb112553e18 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -37,14 +37,12 @@
     #include "wx/settings.h"
 #endif
 
     #include "wx/settings.h"
 #endif
 

+#include "wx/dynlib.h"

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

-// Set this to 1 to be _absolutely_ sure that repainting will work for all
-// comctl32.dll versions
-#define wxUSE_COMCTL32_SAFELY 0
-

 #include "wx/imaglist.h"
 #include "wx/msw/dragimag.h"
 #include "wx/imaglist.h"
 #include "wx/msw/dragimag.h"

+#include "wx/msw/uxtheme.h"

 
 // macros to hide the cast ugliness
 // --------------------------------
 
 // macros to hide the cast ugliness
 // --------------------------------


@@ -79,20 +77,28 @@ typedef struct tagNMTVITEMCHANGE
 // The vista tree control includes some new code that originally broke the
 // multi-selection tree, causing seemingly spurious item selection state changes
 // during Shift or Ctrl-click item selection. (To witness the original broken
 // The vista tree control includes some new code that originally broke the
 // multi-selection tree, causing seemingly spurious item selection state changes
 // during Shift or Ctrl-click item selection. (To witness the original broken

-// behavior, simply make IsLocked() below always return false). This problem was
+// behaviour, simply make IsLocked() below always return false). This problem was

 // solved by using the following class to 'unlock' an item's selection state.
 
 class TreeItemUnlocker
 {
 public:
     // unlock a single item
 // solved by using the following class to 'unlock' an item's selection state.
 
 class TreeItemUnlocker
 {
 public:
     // unlock a single item

-    TreeItemUnlocker(HTREEITEM item) { ms_unlockedItem = item; }
+    TreeItemUnlocker(HTREEITEM item)
+    {
+        m_oldUnlockedItem = ms_unlockedItem;
+        ms_unlockedItem = item;
+    }

 
     // unlock all items, don't use unless absolutely necessary
 
     // unlock all items, don't use unless absolutely necessary

-    TreeItemUnlocker() { ms_unlockedItem = (HTREEITEM)-1; }
+    TreeItemUnlocker()
+    {
+        m_oldUnlockedItem = ms_unlockedItem;
+        ms_unlockedItem = (HTREEITEM)-1;
+    }

 
     // lock everything back
 
     // lock everything back

-    ~TreeItemUnlocker() { ms_unlockedItem = NULL; }
+    ~TreeItemUnlocker() { ms_unlockedItem = m_oldUnlockedItem; }

 
 
     // check if the item state is currently locked
 
 
     // check if the item state is currently locked


@@ -101,18 +107,70 @@ public:
 
 private:
     static HTREEITEM ms_unlockedItem;
 
 private:
     static HTREEITEM ms_unlockedItem;

+    HTREEITEM m_oldUnlockedItem;
+
+    wxDECLARE_NO_COPY_CLASS(TreeItemUnlocker);

 };
 
 HTREEITEM TreeItemUnlocker::ms_unlockedItem = NULL;
 
 };
 
 HTREEITEM TreeItemUnlocker::ms_unlockedItem = NULL;
 

+// another helper class: set the variable to true during its lifetime and reset
+// it to false when it is destroyed
+//
+// it is currently always used with wxTreeCtrl::m_changingSelection
+class TempSetter
+{
+public:
+    TempSetter(bool& var) : m_var(var)
+    {
+        wxASSERT_MSG( !m_var, "variable shouldn't be already set" );
+        m_var = true;
+    }
+
+    ~TempSetter()
+    {
+        m_var = false;
+    }
+
+private:
+    bool& m_var;
+
+    wxDECLARE_NO_COPY_CLASS(TempSetter);
+};
+

 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // private functions
 // ----------------------------------------------------------------------------
 

+namespace
+{
+
+// Work around a problem with TreeView_GetItemRect() when using MinGW/Cygwin:
+// it results in warnings about breaking strict aliasing rules because HITEM is
+// passed via a RECT pointer, so use a union to avoid them and define our own
+// version of the standard macro using it.
+union TVGetItemRectParam
+{
+    RECT rect;
+    HTREEITEM hItem;
+};
+
+inline bool
+wxTreeView_GetItemRect(HWND hwnd,
+                       HTREEITEM hItem,
+                       TVGetItemRectParam& param,
+                       BOOL fItemRect)
+{
+    param.hItem = hItem;
+    return ::SendMessage(hwnd, TVM_GETITEMRECT, fItemRect,
+                        (LPARAM)&param) == TRUE;
+}
+
+} // anonymous namespace
+

 // wrappers for TreeView_GetItem/TreeView_SetItem
 static bool IsItemSelected(HWND hwndTV, HTREEITEM hItem)
 {
 // wrappers for TreeView_GetItem/TreeView_SetItem
 static bool IsItemSelected(HWND hwndTV, HTREEITEM hItem)
 {

-

     TV_ITEM tvi;
     tvi.mask = TVIF_STATE | TVIF_HANDLE;
     tvi.stateMask = TVIS_SELECTED;
     TV_ITEM tvi;
     tvi.mask = TVIF_STATE | TVIF_HANDLE;
     tvi.stateMask = TVIS_SELECTED;


@@ -152,32 +210,60 @@ static inline void UnselectItem(HWND hwndTV, HTREEITEM htItem)
     SelectItem(hwndTV, htItem, false);
 }
 
     SelectItem(hwndTV, htItem, false);
 }
 

+static inline void ToggleItemSelection(HWND hwndTV, HTREEITEM htItem)
+{
+    SelectItem(hwndTV, htItem, !IsItemSelected(hwndTV, htItem));
+}
+

 // helper function which selects all items in a range and, optionally,
 // helper function which selects all items in a range and, optionally,

-// unselects all others
-static void SelectRange(HWND hwndTV,
+// deselects all the other ones
+//
+// returns true if the selection changed at all or false if nothing changed
+
+// flags for SelectRange()
+enum
+{
+    SR_SIMULATE = 1,        // don't do anything, just return true or false
+    SR_UNSELECT_OTHERS = 2  // deselect the items not in range
+};
+
+static bool SelectRange(HWND hwndTV,

                         HTREEITEM htFirst,
                         HTREEITEM htLast,
                         HTREEITEM htFirst,
                         HTREEITEM htLast,

-                        bool unselectOthers = true)
+                        int flags)

 {
     // find the first (or last) item and select it
 {
     // find the first (or last) item and select it

+    bool changed = false;

     bool cont = true;
     HTREEITEM htItem = (HTREEITEM)TreeView_GetRoot(hwndTV);
     bool cont = true;
     HTREEITEM htItem = (HTREEITEM)TreeView_GetRoot(hwndTV);

+

     while ( htItem && cont )
     {
         if ( (htItem == htFirst) || (htItem == htLast) )
         {
             if ( !IsItemSelected(hwndTV, htItem) )
             {
     while ( htItem && cont )
     {
         if ( (htItem == htFirst) || (htItem == htLast) )
         {
             if ( !IsItemSelected(hwndTV, htItem) )
             {

-                SelectItem(hwndTV, htItem);
+                if ( !(flags & SR_SIMULATE) )
+                {
+                    SelectItem(hwndTV, htItem);
+                }
+
+                changed = true;

             }
 
             cont = false;
         }
             }
 
             cont = false;
         }

-        else
+        else // not first or last

         {
         {

-            if ( unselectOthers && IsItemSelected(hwndTV, htItem) )
+            if ( flags & SR_UNSELECT_OTHERS )

             {
             {

-                UnselectItem(hwndTV, htItem);
+                if ( IsItemSelected(hwndTV, htItem) )
+                {
+                    if ( !(flags & SR_SIMULATE) )
+                        UnselectItem(hwndTV, htItem);
+
+                    changed = true;
+                }

             }
         }
 
             }
         }
 


@@ -190,7 +276,12 @@ static void SelectRange(HWND hwndTV,
     {
         if ( !IsItemSelected(hwndTV, htItem) )
         {
     {
         if ( !IsItemSelected(hwndTV, htItem) )
         {

-            SelectItem(hwndTV, htItem);
+            if ( !(flags & SR_SIMULATE) )
+            {
+                SelectItem(hwndTV, htItem);
+            }
+
+            changed = true;

         }
 
         cont = (htItem != htFirst) && (htItem != htLast);
         }
 
         cont = (htItem != htFirst) && (htItem != htLast);


@@ -198,14 +289,19 @@ static void SelectRange(HWND hwndTV,
         htItem = (HTREEITEM)TreeView_GetNextVisible(hwndTV, htItem);
     }
 
         htItem = (HTREEITEM)TreeView_GetNextVisible(hwndTV, htItem);
     }
 

-    // unselect the rest
-    if ( unselectOthers )
+    // optionally deselect the rest
+    if ( flags & SR_UNSELECT_OTHERS )

     {
         while ( htItem )
         {
             if ( IsItemSelected(hwndTV, htItem) )
             {
     {
         while ( htItem )
         {
             if ( IsItemSelected(hwndTV, htItem) )
             {

-                UnselectItem(hwndTV, htItem);
+                if ( !(flags & SR_SIMULATE) )
+                {
+                    UnselectItem(hwndTV, htItem);
+                }
+
+                changed = true;

             }
 
             htItem = (HTREEITEM)TreeView_GetNextVisible(hwndTV, htItem);
             }
 
             htItem = (HTREEITEM)TreeView_GetNextVisible(hwndTV, htItem);


@@ -214,7 +310,12 @@ static void SelectRange(HWND hwndTV,
 
     // seems to be necessary - otherwise the just selected items don't always
     // appear as selected
 
     // seems to be necessary - otherwise the just selected items don't always
     // appear as selected

-    UpdateWindow(hwndTV);
+    if ( !(flags & SR_SIMULATE) )
+    {
+        UpdateWindow(hwndTV);
+    }
+
+    return changed;

 }
 
 // helper function which tricks the standard control into changing the focused
 }
 
 // helper function which tricks the standard control into changing the focused


@@ -349,14 +450,18 @@ public:
             switch ( which )
             {
                 case wxTreeItemIcon_SelectedExpanded:
             switch ( which )
             {
                 case wxTreeItemIcon_SelectedExpanded:

-                    image = GetImage(wxTreeItemIcon_Expanded);
+                    // We consider that expanded icon is more important than
+                    // selected so test for it first.
+                    image = m_images[wxTreeItemIcon_Expanded];
+                    if ( image == -1 )
+                        image = m_images[wxTreeItemIcon_Selected];

                     if ( image != -1 )
                         break;
                     //else: fall through
 
                 case wxTreeItemIcon_Selected:
                 case wxTreeItemIcon_Expanded:
                     if ( image != -1 )
                         break;
                     //else: fall through
 
                 case wxTreeItemIcon_Selected:
                 case wxTreeItemIcon_Expanded:

-                    image = GetImage(wxTreeItemIcon_Normal);
+                    image = m_images[wxTreeItemIcon_Normal];

                     break;
 
                 case wxTreeItemIcon_Normal:
                     break;
 
                 case wxTreeItemIcon_Normal:


@@ -364,7 +469,7 @@ public:
                     break;
 
                 default:
                     break;
 
                 default:

-                    wxFAIL_MSG( _T("unsupported wxTreeItemIcon value") );
+                    wxFAIL_MSG( wxT("unsupported wxTreeItemIcon value") );

             }
         }
 
             }
         }
 


@@ -388,7 +493,7 @@ protected:
     // the real client data
     wxTreeItemData *m_data;
 
     // the real client data
     wxTreeItemData *m_data;
 

-    DECLARE_NO_COPY_CLASS(wxTreeItemParam)
+    wxDECLARE_NO_COPY_CLASS(wxTreeItemParam);

 };
 
 // wxVirutalNode is used in place of a single root when 'hidden' root is
 };
 
 // wxVirutalNode is used in place of a single root when 'hidden' root is


@@ -413,7 +518,7 @@ public:
 private:
     wxTreeItemParam *m_param;
 
 private:
     wxTreeItemParam *m_param;
 

-    DECLARE_NO_COPY_CLASS(wxVirtualNode)
+    wxDECLARE_NO_COPY_CLASS(wxVirtualNode);

 };
 
 #ifdef __VISUALC__
 };
 
 #ifdef __VISUALC__


@@ -458,7 +563,7 @@ private:
 
     const wxTreeCtrl *m_tree;
 
 
     const wxTreeCtrl *m_tree;
 

-    DECLARE_NO_COPY_CLASS(wxTreeTraversal)
+    wxDECLARE_NO_COPY_CLASS(wxTreeTraversal);

 };
 
 // internal class for getting the selected items
 };
 
 // internal class for getting the selected items


@@ -498,7 +603,7 @@ public:
 private:
     wxArrayTreeItemIds& m_selections;
 
 private:
     wxArrayTreeItemIds& m_selections;
 

-    DECLARE_NO_COPY_CLASS(TraverseSelections)
+    wxDECLARE_NO_COPY_CLASS(TraverseSelections);

 };
 
 // internal class for counting tree items
 };
 
 // internal class for counting tree items


@@ -527,79 +632,13 @@ public:
 private:
     size_t m_count;
 
 private:
     size_t m_count;
 

-    DECLARE_NO_COPY_CLASS(TraverseCounter)
+    wxDECLARE_NO_COPY_CLASS(TraverseCounter);

 };
 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 
 };
 
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
 

-#if wxUSE_EXTENDED_RTTI
-WX_DEFINE_FLAGS( wxTreeCtrlStyle )
-
-wxBEGIN_FLAGS( wxTreeCtrlStyle )
-    // new style border flags, we put them first to
-    // use them for streaming out
-    wxFLAGS_MEMBER(wxBORDER_SIMPLE)
-    wxFLAGS_MEMBER(wxBORDER_SUNKEN)
-    wxFLAGS_MEMBER(wxBORDER_DOUBLE)
-    wxFLAGS_MEMBER(wxBORDER_RAISED)
-    wxFLAGS_MEMBER(wxBORDER_STATIC)
-    wxFLAGS_MEMBER(wxBORDER_NONE)
-
-    // old style border flags
-    wxFLAGS_MEMBER(wxSIMPLE_BORDER)
-    wxFLAGS_MEMBER(wxSUNKEN_BORDER)
-    wxFLAGS_MEMBER(wxDOUBLE_BORDER)
-    wxFLAGS_MEMBER(wxRAISED_BORDER)
-    wxFLAGS_MEMBER(wxSTATIC_BORDER)
-    wxFLAGS_MEMBER(wxBORDER)
-
-    // standard window styles
-    wxFLAGS_MEMBER(wxTAB_TRAVERSAL)
-    wxFLAGS_MEMBER(wxCLIP_CHILDREN)
-    wxFLAGS_MEMBER(wxTRANSPARENT_WINDOW)
-    wxFLAGS_MEMBER(wxWANTS_CHARS)
-    wxFLAGS_MEMBER(wxFULL_REPAINT_ON_RESIZE)
-    wxFLAGS_MEMBER(wxALWAYS_SHOW_SB )
-    wxFLAGS_MEMBER(wxVSCROLL)
-    wxFLAGS_MEMBER(wxHSCROLL)
-
-    wxFLAGS_MEMBER(wxTR_EDIT_LABELS)
-    wxFLAGS_MEMBER(wxTR_NO_BUTTONS)
-    wxFLAGS_MEMBER(wxTR_HAS_BUTTONS)
-    wxFLAGS_MEMBER(wxTR_TWIST_BUTTONS)
-    wxFLAGS_MEMBER(wxTR_NO_LINES)
-    wxFLAGS_MEMBER(wxTR_FULL_ROW_HIGHLIGHT)
-    wxFLAGS_MEMBER(wxTR_LINES_AT_ROOT)
-    wxFLAGS_MEMBER(wxTR_HIDE_ROOT)
-    wxFLAGS_MEMBER(wxTR_ROW_LINES)
-    wxFLAGS_MEMBER(wxTR_HAS_VARIABLE_ROW_HEIGHT)
-    wxFLAGS_MEMBER(wxTR_SINGLE)
-    wxFLAGS_MEMBER(wxTR_MULTIPLE)
-#if WXWIN_COMPATIBILITY_2_8
-    wxFLAGS_MEMBER(wxTR_EXTENDED)
-#endif
-    wxFLAGS_MEMBER(wxTR_DEFAULT_STYLE)
-
-wxEND_FLAGS( wxTreeCtrlStyle )
-
-IMPLEMENT_DYNAMIC_CLASS_XTI(wxTreeCtrl, wxControl,"wx/treectrl.h")
-
-wxBEGIN_PROPERTIES_TABLE(wxTreeCtrl)
-    wxEVENT_PROPERTY( TextUpdated , wxEVT_COMMAND_TEXT_UPDATED , wxCommandEvent )
-    wxEVENT_RANGE_PROPERTY( TreeEvent , wxEVT_COMMAND_TREE_BEGIN_DRAG , wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK , wxTreeEvent )
-    wxPROPERTY_FLAGS( WindowStyle , wxTreeCtrlStyle , long , SetWindowStyleFlag , GetWindowStyleFlag , EMPTY_MACROVALUE , 0 /*flags*/ , wxT("Helpstring") , wxT("group")) // style
-wxEND_PROPERTIES_TABLE()
-
-wxBEGIN_HANDLERS_TABLE(wxTreeCtrl)
-wxEND_HANDLERS_TABLE()
-
-wxCONSTRUCTOR_5( wxTreeCtrl , wxWindow* , Parent , wxWindowID , Id , wxPoint , Position , wxSize , Size , long , WindowStyle )
-#else
-IMPLEMENT_DYNAMIC_CLASS(wxTreeCtrl, wxControl)
-#endif
-

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------


@@ -627,8 +666,8 @@ static /* const */ wxEventType gs_expandEvents[IDX_WHAT_MAX][IDX_HOW_MAX];
    but logically it's a const table with the following entries:
 =
 {
    but logically it's a const table with the following entries:
 =
 {

-    { wxEVT_COMMAND_TREE_ITEM_COLLAPSED, wxEVT_COMMAND_TREE_ITEM_COLLAPSING },
-    { wxEVT_COMMAND_TREE_ITEM_EXPANDED,  wxEVT_COMMAND_TREE_ITEM_EXPANDING  }
+    { wxEVT_TREE_ITEM_COLLAPSED, wxEVT_TREE_ITEM_COLLAPSING },
+    { wxEVT_TREE_ITEM_EXPANDED,  wxEVT_TREE_ITEM_EXPANDING  }

 };
 */
 
 };
 */
 


@@ -679,13 +718,18 @@ void wxTreeCtrl::Init()
     m_dragImage = NULL;
 #endif
     m_pVirtualRoot = NULL;
     m_dragImage = NULL;
 #endif
     m_pVirtualRoot = NULL;

+    m_dragStarted = false;
+    m_focusLost = true;
+    m_changingSelection = false;
+    m_triggerStateImageClick = false;
+    m_mouseUpDeselect = false;

 
     // initialize the global array of events now as it can't be done statically
     // with the wxEVT_XXX values being allocated during run-time only
 
     // initialize the global array of events now as it can't be done statically
     // with the wxEVT_XXX values being allocated during run-time only

-    gs_expandEvents[IDX_COLLAPSE][IDX_DONE] = wxEVT_COMMAND_TREE_ITEM_COLLAPSED;
-    gs_expandEvents[IDX_COLLAPSE][IDX_DOING] = wxEVT_COMMAND_TREE_ITEM_COLLAPSING;
-    gs_expandEvents[IDX_EXPAND][IDX_DONE] = wxEVT_COMMAND_TREE_ITEM_EXPANDED;
-    gs_expandEvents[IDX_EXPAND][IDX_DOING] = wxEVT_COMMAND_TREE_ITEM_EXPANDING;
+    gs_expandEvents[IDX_COLLAPSE][IDX_DONE] = wxEVT_TREE_ITEM_COLLAPSED;
+    gs_expandEvents[IDX_COLLAPSE][IDX_DOING] = wxEVT_TREE_ITEM_COLLAPSING;
+    gs_expandEvents[IDX_EXPAND][IDX_DONE] = wxEVT_TREE_ITEM_EXPANDED;
+    gs_expandEvents[IDX_EXPAND][IDX_DOING] = wxEVT_TREE_ITEM_EXPANDING;

 }
 
 bool wxTreeCtrl::Create(wxWindow *parent,
 }
 
 bool wxTreeCtrl::Create(wxWindow *parent,


@@ -708,7 +752,7 @@ bool wxTreeCtrl::Create(wxWindow *parent,
     DWORD wstyle = MSWGetStyle(m_windowStyle, & exStyle);
     wstyle |= WS_TABSTOP | TVS_SHOWSELALWAYS;
 
     DWORD wstyle = MSWGetStyle(m_windowStyle, & exStyle);
     wstyle |= WS_TABSTOP | TVS_SHOWSELALWAYS;
 

-    if ((m_windowStyle & wxTR_NO_LINES) == 0)
+    if ( !(m_windowStyle & wxTR_NO_LINES) )

         wstyle |= TVS_HASLINES;
     if ( m_windowStyle & wxTR_HAS_BUTTONS )
         wstyle |= TVS_HASBUTTONS;
         wstyle |= TVS_HASLINES;
     if ( m_windowStyle & wxTR_HAS_BUTTONS )
         wstyle |= TVS_HASBUTTONS;


@@ -734,82 +778,32 @@ bool wxTreeCtrl::Create(wxWindow *parent,
     if ( !MSWCreateControl(WC_TREEVIEW, wstyle, pos, size) )
         return false;
 
     if ( !MSWCreateControl(WC_TREEVIEW, wstyle, pos, size) )
         return false;
 

-#if wxUSE_COMCTL32_SAFELY
-    wxWindow::SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-    wxWindow::SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
-#elif 1

     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
     SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());

-#else
-    // This works around a bug in the Windows tree control whereby for some versions
-    // of comctrl32, setting any colour actually draws the background in black.
-    // This will initialise the background to the system colour.
-    // THIS FIX NOW REVERTED since it caused problems on _other_ systems.
-    // Assume the user has an updated comctl32.dll.
-    ::SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0,-1);
-    wxWindow::SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
-    SetForegroundColour(wxWindow::GetParent()->GetForegroundColour());
-#endif
-
-
-    // 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);
+    wxSetCCUnicodeFormat(GetHwnd());

 
 

-        if ( !::DrawFrameControl(hdcMem, &rect,
-                                 DFC_BUTTON,
-                                 DFCS_BUTTONCHECK) )
+    if ( m_windowStyle & wxTR_TWIST_BUTTONS )
+    {
+        // Under Vista and later Explorer uses rotating ("twist") buttons
+        // instead of the default "+/-" ones so apply its theme to the tree
+        // control to implement this style.
+        if ( wxGetWinVersion() >= wxWinVersion_Vista )

         {
         {

-            wxLogLastError(wxT("DrawFrameControl(uncheck)"));
+            if ( wxUxThemeEngine *theme = wxUxThemeEngine::GetIfActive() )
+            {
+                theme->SetWindowTheme(GetHwnd(), L"EXPLORER", NULL);
+            }

         }
         }

-
-        bmp.SetHBITMAP((WXHBITMAP)hbmpCheck);
-        imagelistCheckboxes.Add(bmp);
-
-        // clean up
-        ::DeleteDC(hdcMem);
-
-        // set the imagelist
-        SetStateImageList(&imagelistCheckboxes);

     }
     }

-#endif // 0
-
-    wxSetCCUnicodeFormat(GetHwnd());

 
     return true;
 }
 
 wxTreeCtrl::~wxTreeCtrl()
 {
 
     return true;
 }
 
 wxTreeCtrl::~wxTreeCtrl()
 {

+    m_isBeingDeleted = true;
+

     // delete any attributes
     if ( m_hasAnyAttr )
     {
     // delete any attributes
     if ( m_hasAnyAttr )
     {


@@ -847,7 +841,7 @@ wxTreeCtrl::GetClassDefaultAttributes(wxWindowVariant variant)
 bool wxTreeCtrl::DoGetItem(wxTreeViewItem *tvItem) const
 {
     wxCHECK_MSG( tvItem->hItem != TVI_ROOT, false,
 bool wxTreeCtrl::DoGetItem(wxTreeViewItem *tvItem) const
 {
     wxCHECK_MSG( tvItem->hItem != TVI_ROOT, false,

-                 _T("can't retrieve virtual root item") );
+                 wxT("can't retrieve virtual root item") );

 
     if ( !TreeView_GetItem(GetHwnd(), tvItem) )
     {
 
     if ( !TreeView_GetItem(GetHwnd(), tvItem) )
     {


@@ -923,24 +917,20 @@ size_t wxTreeCtrl::GetChildrenCount(const wxTreeItemId& item,
 
 bool wxTreeCtrl::SetBackgroundColour(const wxColour &colour)
 {
 
 bool wxTreeCtrl::SetBackgroundColour(const wxColour &colour)
 {

-#if !wxUSE_COMCTL32_SAFELY

     if ( !wxWindowBase::SetBackgroundColour(colour) )
         return false;
 
     ::SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel());
     if ( !wxWindowBase::SetBackgroundColour(colour) )
         return false;
 
     ::SendMessage(GetHwnd(), TVM_SETBKCOLOR, 0, colour.GetPixel());

-#endif

 
     return true;
 }
 
 bool wxTreeCtrl::SetForegroundColour(const wxColour &colour)
 {
 
     return true;
 }
 
 bool wxTreeCtrl::SetForegroundColour(const wxColour &colour)
 {

-#if !wxUSE_COMCTL32_SAFELY

     if ( !wxWindowBase::SetForegroundColour(colour) )
         return false;
 
     ::SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel());
     if ( !wxWindowBase::SetForegroundColour(colour) )
         return false;
 
     ::SendMessage(GetHwnd(), TVM_SETTEXTCOLOR, 0, colour.GetPixel());

-#endif

 
     return true;
 }
 
     return true;
 }


@@ -980,7 +970,7 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
         return;
 
     wxTreeViewItem tvItem(item, TVIF_TEXT);
         return;
 
     wxTreeViewItem tvItem(item, TVIF_TEXT);

-    tvItem.pszText = (wxChar *)text.wx_str();  // conversion is ok
+    tvItem.pszText = wxMSW_CONV_LPTSTR(text);

     DoSetItem(&tvItem);
 
     // when setting the text of the item being edited, the text control should
     DoSetItem(&tvItem);
 
     // when setting the text of the item being edited, the text control should


@@ -993,7 +983,7 @@ void wxTreeCtrl::SetItemText(const wxTreeItemId& item, const wxString& text)
     {
         if ( item == m_idEdited )
         {
     {
         if ( item == m_idEdited )
         {

-            ::SetWindowText(hwndEdit, text.wx_str());
+            ::SetWindowText(hwndEdit, text.t_str());

         }
     }
 }
         }
     }
 }


@@ -1059,6 +1049,16 @@ wxTreeItemParam *wxTreeCtrl::GetItemParam(const wxTreeItemId& item) const
     return (wxTreeItemParam *)tvItem.lParam;
 }
 
     return (wxTreeItemParam *)tvItem.lParam;
 }
 

+bool wxTreeCtrl::HandleTreeEvent(wxTreeEvent& event) const
+{
+    if ( event.m_item.IsOk() )
+    {
+        event.SetClientObject(GetItemData(event.m_item));
+    }
+
+    return HandleWindowEvent(event);
+}
+

 wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
 {
     wxTreeItemParam *data = GetItemParam(item);
 wxTreeItemData *wxTreeCtrl::GetItemData(const wxTreeItemId& item) const
 {
     wxTreeItemParam *data = GetItemParam(item);


@@ -1241,14 +1241,10 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
     }
 
     // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect
     }
 
     // Bug in Gnu-Win32 headers, so don't use the macro TreeView_GetItemRect

-    RECT rect;
-
-    // this ugliness comes directly from MSDN - it *is* the correct way to pass
-    // the HTREEITEM with TVM_GETITEMRECT
-    *(HTREEITEM *)&rect = HITEM(item);
+    TVGetItemRectParam param;

 
     // true means to get rect for just the text, not the whole line
 
     // true means to get rect for just the text, not the whole line

-    if ( !::SendMessage(GetHwnd(), TVM_GETITEMRECT, true, (LPARAM)&rect) )
+    if ( !wxTreeView_GetItemRect(GetHwnd(), HITEM(item), param, TRUE) )

     {
         // if TVM_GETITEMRECT returned false, then the item is definitely not
         // visible (because its parent is not expanded)
     {
         // if TVM_GETITEMRECT returned false, then the item is definitely not
         // visible (because its parent is not expanded)


@@ -1258,13 +1254,19 @@ bool wxTreeCtrl::IsVisible(const wxTreeItemId& item) const
     // however if it returned true, the item might still be outside the
     // currently visible part of the tree, test for it (notice that partly
     // visible means visible here)
     // however if it returned true, the item might still be outside the
     // currently visible part of the tree, test for it (notice that partly
     // visible means visible here)

-    return rect.bottom > 0 && rect.top < GetClientSize().y;
+    return param.rect.bottom > 0 && param.rect.top < GetClientSize().y;

 }
 
 bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 {
     wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
 
 }
 
 bool wxTreeCtrl::ItemHasChildren(const wxTreeItemId& item) const
 {
     wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
 

+    if ( IS_VIRTUAL_ROOT(item) )
+    {
+        wxTreeItemIdValue cookie;
+        return GetFirstChild(item, cookie).IsOk();
+    }
+

     wxTreeViewItem tvItem(item, TVIF_CHILDREN);
     DoGetItem(&tvItem);
 
     wxTreeViewItem tvItem(item, TVIF_CHILDREN);
     DoGetItem(&tvItem);
 


@@ -1316,9 +1318,14 @@ wxTreeItemId wxTreeCtrl::GetRootItem() const
 
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {
 
 wxTreeItemId wxTreeCtrl::GetSelection() const
 {

-    wxCHECK_MSG( !(m_windowStyle & wxTR_MULTIPLE), wxTreeItemId(),
+    wxCHECK_MSG( !HasFlag(wxTR_MULTIPLE), wxTreeItemId(),

                  wxT("this only works with single selection controls") );
 
                  wxT("this only works with single selection controls") );
 

+    return GetFocusedItem();
+}
+
+wxTreeItemId wxTreeCtrl::GetFocusedItem() const
+{

     return wxTreeItemId(TreeView_GetSelection(GetHwnd()));
 }
 
     return wxTreeItemId(TreeView_GetSelection(GetHwnd()));
 }
 


@@ -1444,33 +1451,6 @@ wxTreeItemId wxTreeCtrl::GetPrevVisible(const wxTreeItemId& item) const
 // multiple selections emulation
 // ----------------------------------------------------------------------------
 
 // multiple selections emulation
 // ----------------------------------------------------------------------------
 

-bool wxTreeCtrl::IsItemChecked(const wxTreeItemId& item) const
-{
-    wxCHECK_MSG( item.IsOk(), false, wxT("invalid tree item") );
-
-    // receive the desired information.
-    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
-    DoGetItem(&tvItem);
-
-    // state image indices are 1 based
-    return ((tvItem.state >> 12) - 1) == 1;
-}
-
-void wxTreeCtrl::SetItemCheck(const wxTreeItemId& item, bool check)
-{
-    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
-
-    // receive the desired information.
-    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
-
-    DoGetItem(&tvItem);
-
-    // state images are one-based
-    tvItem.state = (check ? 2 : 1) << 12;
-
-    DoSetItem(&tvItem);
-}
-

 size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds& selections) const
 {
     TraverseSelections selector(this, selections);
 size_t wxTreeCtrl::GetSelections(wxArrayTreeItemIds& selections) const
 {
     TraverseSelections selector(this, selections);


@@ -1490,7 +1470,7 @@ wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
 {
     wxCHECK_MSG( parent.IsOk() || !TreeView_GetRoot(GetHwnd()),
                  wxTreeItemId(),
 {
     wxCHECK_MSG( parent.IsOk() || !TreeView_GetRoot(GetHwnd()),
                  wxTreeItemId(),

-                 _T("can't have more than one root in the tree") );
+                 wxT("can't have more than one root in the tree") );

 
     TV_INSERTSTRUCT tvIns;
     tvIns.hParent = HITEM(parent);
 
     TV_INSERTSTRUCT tvIns;
     tvIns.hParent = HITEM(parent);


@@ -1507,7 +1487,7 @@ wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
     if ( !text.empty() )
     {
         mask |= TVIF_TEXT;
     if ( !text.empty() )
     {
         mask |= TVIF_TEXT;

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

     }
     else
     {
     }
     else
     {


@@ -1547,9 +1527,10 @@ wxTreeItemId wxTreeCtrl::DoInsertAfter(const wxTreeItemId& parent,
     // need this to make the "[+]" appear
     if ( firstChild )
     {
     // need this to make the "[+]" appear
     if ( firstChild )
     {

-        RECT rect;
-        TreeView_GetItemRect(GetHwnd(), HITEM(parent), &rect, FALSE);
-        ::InvalidateRect(GetHwnd(), &rect, FALSE);
+        TVGetItemRectParam param;
+
+        wxTreeView_GetItemRect(GetHwnd(), HITEM(parent), param, FALSE);
+        ::InvalidateRect(GetHwnd(), &param.rect, FALSE);

     }
 
     // associate the application tree item with Win32 tree item handle
     }
 
     // associate the application tree item with Win32 tree item handle


@@ -1571,7 +1552,7 @@ wxTreeItemId wxTreeCtrl::AddRoot(const wxString& text,
 {
     if ( HasFlag(wxTR_HIDE_ROOT) )
     {
 {
     if ( HasFlag(wxTR_HIDE_ROOT) )
     {

-        wxASSERT_MSG( !m_pVirtualRoot, _T("tree can have only a single root") );
+        wxASSERT_MSG( !m_pVirtualRoot, wxT("tree can have only a single root") );

 
         // create a virtual root item, the parent for all the others
         wxTreeItemParam *param = new wxTreeItemParam;
 
         // create a virtual root item, the parent for all the others
         wxTreeItemParam *param = new wxTreeItemParam;


@@ -1612,7 +1593,7 @@ wxTreeItemId wxTreeCtrl::DoInsertItem(const wxTreeItemId& parent,
 
         // assert, not check: if the index is invalid, we will append the item
         // to the end
 
         // assert, not check: if the index is invalid, we will append the item
         // to the end

-        wxASSERT_MSG( index == 0, _T("bad index in wxTreeCtrl::InsertItem") );
+        wxASSERT_MSG( index == 0, wxT("bad index in wxTreeCtrl::InsertItem") );

     }
 
     return DoInsertAfter(parent, idPrev, text, image, selectedImage, data);
     }
 
     return DoInsertAfter(parent, idPrev, text, image, selectedImage, data);


@@ -1624,9 +1605,63 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
     // tree ctrl will eventually crash after item deletion
     TreeItemUnlocker unlock_all;
 
     // tree ctrl will eventually crash after item deletion
     TreeItemUnlocker unlock_all;
 

-    if ( !TreeView_DeleteItem(GetHwnd(), HITEM(item)) )
+    if ( HasFlag(wxTR_MULTIPLE) )
+    {
+        bool selected = IsSelected(item);
+        wxTreeItemId next;
+
+        if ( selected )
+        {
+            next = TreeView_GetNextVisible(GetHwnd(), HITEM(item));
+
+            if ( !next.IsOk() )
+            {
+                next = TreeView_GetPrevVisible(GetHwnd(), HITEM(item));
+            }
+        }
+
+        {
+            TempSetter set(m_changingSelection);
+            if ( !TreeView_DeleteItem(GetHwnd(), HITEM(item)) )
+            {
+                wxLogLastError(wxT("TreeView_DeleteItem"));
+                return;
+            }
+        }
+
+        if ( !selected )
+        {
+            return;
+        }
+
+        if ( item == m_htSelStart )
+            m_htSelStart.Unset();
+
+        if ( item == m_htClickedItem )
+            m_htClickedItem.Unset();
+
+        if ( next.IsOk() )
+        {
+            wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);
+
+            if ( IsTreeEventAllowed(changingEvent) )
+            {
+                wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);
+                (void)HandleTreeEvent(changedEvent);
+            }
+            else
+            {
+                DoUnselectItem(next);
+                ClearFocusedItem();
+            }
+        }
+    }
+    else

     {
     {

-        wxLogLastError(wxT("TreeView_DeleteItem"));
+        if ( !TreeView_DeleteItem(GetHwnd(), HITEM(item)) )
+        {
+            wxLogLastError(wxT("TreeView_DeleteItem"));
+        }

     }
 }
 
     }
 }
 


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

-        if ( !TreeView_DeleteItem(GetHwnd(), HITEM(children[n])) )
-        {
-            wxLogLastError(wxT("TreeView_DeleteItem"));
-        }
+        Delete(children[n]);

     }
 }
 
     }
 }
 


@@ -1662,6 +1694,10 @@ void wxTreeCtrl::DeleteAllItems()
     // unlock tree selections on vista for the duration of this call
     TreeItemUnlocker unlock_all;
 
     // unlock tree selections on vista for the duration of this call
     TreeItemUnlocker unlock_all;
 

+    // invalidate all the items we store as they're going to become invalid
+    m_htSelStart =
+    m_htClickedItem = wxTreeItemId();
+

     // delete the "virtual" root item.
     if ( GET_VIRTUAL_ROOT() )
     {
     // delete the "virtual" root item.
     if ( GET_VIRTUAL_ROOT() )
     {


@@ -1701,15 +1737,22 @@ void wxTreeCtrl::DoExpand(const wxTreeItemId& item, int flag)
     tvItem.state = 0;
     DoSetItem(&tvItem);
 
     tvItem.state = 0;
     DoSetItem(&tvItem);
 

-    if ( TreeView_Expand(GetHwnd(), HITEM(item), flag) != 0 )
+    if ( IsExpanded(item) )
+    {
+        wxTreeEvent event(wxEVT_TREE_ITEM_COLLAPSING,
+                          this, wxTreeItemId(item));
+
+        if ( !IsTreeEventAllowed(event) )
+            return;
+    }
+
+    if ( TreeView_Expand(GetHwnd(), HITEM(item), flag) )

     {
     {

-        // note that the {EXPAND|COLLAPS}ING event is sent by TreeView_Expand()
-        // itself
-        wxTreeEvent event(gs_expandEvents[IsExpanded(item) ? IDX_EXPAND
-                                                           : IDX_COLLAPSE]
-                                         [IDX_DONE],
-                           this, item);
-        (void)HandleWindowEvent(event);
+        if ( IsExpanded(item) )
+            return;
+
+        wxTreeEvent event(wxEVT_TREE_ITEM_COLLAPSED, this, item);
+        (void)HandleTreeEvent(event);

     }
     //else: change didn't took place, so do nothing at all
 }
     }
     //else: change didn't took place, so do nothing at all
 }


@@ -1736,70 +1779,193 @@ void wxTreeCtrl::Toggle(const wxTreeItemId& item)
 
 void wxTreeCtrl::Unselect()
 {
 
 void wxTreeCtrl::Unselect()
 {

-    wxASSERT_MSG( !(m_windowStyle & wxTR_MULTIPLE),
+    wxASSERT_MSG( !HasFlag(wxTR_MULTIPLE),

                   wxT("doesn't make sense, may be you want UnselectAll()?") );
 
                   wxT("doesn't make sense, may be you want UnselectAll()?") );
 

-    // just remove the selection
-    SelectItem(wxTreeItemId());
+    // the current focus
+    HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
+
+    if ( !htFocus )
+    {
+        return;
+    }
+
+    if ( HasFlag(wxTR_MULTIPLE) )
+    {
+        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                  this, wxTreeItemId());
+        changingEvent.m_itemOld = htFocus;
+
+        if ( IsTreeEventAllowed(changingEvent) )
+        {
+            ClearFocusedItem();
+
+            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                     this, wxTreeItemId());
+            changedEvent.m_itemOld = htFocus;
+            (void)HandleTreeEvent(changedEvent);
+        }
+    }
+    else
+    {
+        ClearFocusedItem();
+    }
+}
+
+void wxTreeCtrl::DoUnselectAll()
+{
+    wxArrayTreeItemIds selections;
+    size_t count = GetSelections(selections);
+
+    for ( size_t n = 0; n < count; n++ )
+    {
+        DoUnselectItem(selections[n]);
+    }
+
+    m_htSelStart.Unset();

 }
 
 void wxTreeCtrl::UnselectAll()
 {
 }
 
 void wxTreeCtrl::UnselectAll()
 {

-    if ( m_windowStyle & wxTR_MULTIPLE )
+    if ( HasFlag(wxTR_MULTIPLE) )

     {
     {

-        wxArrayTreeItemIds selections;
-        size_t count = GetSelections(selections);
-        for ( size_t n = 0; n < count; n++ )
+        HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
+        if ( !htFocus ) return;
+
+        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this);
+        changingEvent.m_itemOld = htFocus;
+
+        if ( IsTreeEventAllowed(changingEvent) )

         {
         {

-            ::UnselectItem(GetHwnd(), HITEM(selections[n]));
-        }
+            DoUnselectAll();

 
 

-        m_htSelStart.Unset();
+            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this);
+            changedEvent.m_itemOld = htFocus;
+            (void)HandleTreeEvent(changedEvent);
+        }

     }
     else
     {
     }
     else
     {

-        // just remove the selection

         Unselect();
     }
 }
 
         Unselect();
     }
 }
 

+void wxTreeCtrl::DoSelectChildren(const wxTreeItemId& parent)
+{
+    DoUnselectAll();
+
+    wxTreeItemIdValue cookie;
+    wxTreeItemId child = GetFirstChild(parent, cookie);
+    while ( child.IsOk() )
+    {
+        DoSelectItem(child, true);
+        child = GetNextChild(child, cookie);
+    }
+}
+
+void wxTreeCtrl::SelectChildren(const wxTreeItemId& parent)
+{
+    wxCHECK_RET( HasFlag(wxTR_MULTIPLE),
+                 "this only works with multiple selection controls" );
+
+    HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
+
+    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this);
+    changingEvent.m_itemOld = htFocus;
+
+    if ( IsTreeEventAllowed(changingEvent) )
+    {
+        DoSelectChildren(parent);
+
+        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this);
+        changedEvent.m_itemOld = htFocus;
+        (void)HandleTreeEvent(changedEvent);
+    }
+}
+
+void wxTreeCtrl::DoSelectItem(const wxTreeItemId& item, bool select)
+{
+    TempSetter set(m_changingSelection);
+
+    ::SelectItem(GetHwnd(), HITEM(item), select);
+}
+

 void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
 {
 void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
 {

-    wxCHECK_RET( !IsHiddenRoot(item), _T("can't select hidden root item") );
+    wxCHECK_RET( !IsHiddenRoot(item), wxT("can't select hidden root item") );

 
 

-    wxASSERT_MSG( select || HasFlag(wxTR_MULTIPLE),
-                  _T("SelectItem(false) works only for multiselect") );
+    if ( select == IsSelected(item) )
+    {
+        // nothing to do, the item is already in the requested state
+        return;
+    }

 
 

-    wxTreeEvent event(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
-    if ( !HandleWindowEvent(event) || event.IsAllowed() )
+    if ( HasFlag(wxTR_MULTIPLE) )

     {
     {

-        if ( HasFlag(wxTR_MULTIPLE) )
+        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, item);
+
+        if ( IsTreeEventAllowed(changingEvent) )

         {
         {

-            if ( !::SelectItem(GetHwnd(), HITEM(item), select) )
+            HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
+            DoSelectItem(item, select);
+
+            if ( !htFocus )

             {
             {

-                wxLogLastError(wxT("TreeView_SelectItem"));
-                return;
+                SetFocusedItem(item);

             }
             }

+
+            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                     this, item);
+            (void)HandleTreeEvent(changedEvent);
+        }
+    }
+    else // single selection
+    {
+        wxTreeItemId itemOld, itemNew;
+        if ( select )
+        {
+            itemOld = GetSelection();
+            itemNew = item;
+        }
+        else // deselecting the currently selected item
+        {
+            itemOld = item;
+            // leave itemNew invalid

         }
         }

-        else // single selection
+
+        // Recent versions of comctl32.dll send TVN_SELCHANG{ED,ING} events
+        // when we call TreeView_SelectItem() but apparently some old ones did
+        // not so send the events ourselves and ignore those generated by
+        // TreeView_SelectItem() if m_changingSelection is set.
+        wxTreeEvent
+            changingEvent(wxEVT_TREE_SEL_CHANGING, this, itemNew);
+        changingEvent.SetOldItem(itemOld);
+
+        if ( IsTreeEventAllowed(changingEvent) )

         {
         {

-            // use TreeView_SelectItem() to deselect the previous selection
-            if ( !TreeView_SelectItem(GetHwnd(), HITEM(item)) )
+            TempSetter set(m_changingSelection);
+
+            if ( !TreeView_SelectItem(GetHwnd(), HITEM(itemNew)) )

             {
                 wxLogLastError(wxT("TreeView_SelectItem"));
             {
                 wxLogLastError(wxT("TreeView_SelectItem"));

-                return;

             }
             }

-        }
+            else // ok
+            {
+                ::SetFocus(GetHwnd(), HITEM(item));

 
 

-        event.SetEventType(wxEVT_COMMAND_TREE_SEL_CHANGED);
-        (void)HandleWindowEvent(event);
+                wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                         this, itemNew);
+                changedEvent.SetOldItem(itemOld);
+                (void)HandleTreeEvent(changedEvent);
+            }
+        }
+        //else: program vetoed the change

     }
     }

-    //else: program vetoed the change

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

-    wxCHECK_RET( !IsHiddenRoot(item), _T("can't show hidden root item") );
+    wxCHECK_RET( !IsHiddenRoot(item), wxT("can't show hidden root item") );

 
     // no error return
     TreeView_EnsureVisible(GetHwnd(), HITEM(item));
 
     // no error return
     TreeView_EnsureVisible(GetHwnd(), HITEM(item));


@@ -1832,8 +1998,7 @@ void wxTreeCtrl::DeleteTextCtrl()
 
         m_textCtrl->UnsubclassWin();
         m_textCtrl->SetHWND(0);
 
         m_textCtrl->UnsubclassWin();
         m_textCtrl->SetHWND(0);

-        delete m_textCtrl;
-        m_textCtrl = NULL;
+        wxDELETE(m_textCtrl);

 
         m_idEdited.Unset();
     }
 
         m_idEdited.Unset();
     }


@@ -1842,7 +2007,7 @@ void wxTreeCtrl::DeleteTextCtrl()
 wxTextCtrl *wxTreeCtrl::EditLabel(const wxTreeItemId& item,
                                   wxClassInfo *textControlClass)
 {
 wxTextCtrl *wxTreeCtrl::EditLabel(const wxTreeItemId& item,
                                   wxClassInfo *textControlClass)
 {

-    wxASSERT( textControlClass->IsKindOf(CLASSINFO(wxTextCtrl)) );
+    wxASSERT( textControlClass->IsKindOf(wxCLASSINFO(wxTextCtrl)) );

 
     DeleteTextCtrl();
 
 
     DeleteTextCtrl();
 


@@ -1854,8 +2019,7 @@ wxTextCtrl *wxTreeCtrl::EditLabel(const wxTreeItemId& item,
     // returned false
     if ( !hWnd )
     {
     // returned false
     if ( !hWnd )
     {

-        delete m_textCtrl;
-        m_textCtrl = NULL;
+        wxDELETE(m_textCtrl);

         return NULL;
     }
 
         return NULL;
     }
 


@@ -1906,18 +2070,18 @@ bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
                                  wxRect& rect,
                                  bool textOnly) const
 {
                                  wxRect& rect,
                                  bool textOnly) const
 {

-    RECT rc;
-

     // Virtual root items have no bounding rectangle
     if ( IS_VIRTUAL_ROOT(item) )
     {
         return false;
     }
 
     // Virtual root items have no bounding rectangle
     if ( IS_VIRTUAL_ROOT(item) )
     {
         return false;
     }
 

-    if ( TreeView_GetItemRect(GetHwnd(), HITEM(item),
-                              &rc, textOnly) )
+    TVGetItemRectParam param;
+
+    if ( wxTreeView_GetItemRect(GetHwnd(), HITEM(item), param, textOnly) )

     {
     {

-        rect = wxRect(wxPoint(rc.left, rc.top), wxPoint(rc.right, rc.bottom));
+        rect = wxRect(wxPoint(param.rect.left, param.rect.top),
+                      wxPoint(param.rect.right, param.rect.bottom));

 
         return true;
     }
 
         return true;
     }


@@ -1928,6 +2092,39 @@ bool wxTreeCtrl::GetBoundingRect(const wxTreeItemId& item,
     }
 }
 
     }
 }
 

+void wxTreeCtrl::ClearFocusedItem()
+{
+    TempSetter set(m_changingSelection);
+
+    if ( !TreeView_SelectItem(GetHwnd(), 0) )
+    {
+        wxLogLastError(wxT("TreeView_SelectItem"));
+    }
+}
+
+void wxTreeCtrl::SetFocusedItem(const wxTreeItemId& item)
+{
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+    TempSetter set(m_changingSelection);
+
+    ::SetFocus(GetHwnd(), HITEM(item));
+}
+
+void wxTreeCtrl::DoUnselectItem(const wxTreeItemId& item)
+{
+    TempSetter set(m_changingSelection);
+
+    ::UnselectItem(GetHwnd(), HITEM(item));
+}
+
+void wxTreeCtrl::DoToggleItemSelection(const wxTreeItemId& item)
+{
+    TempSetter set(m_changingSelection);
+
+    ::ToggleItemSelection(GetHwnd(), HITEM(item));
+}
+

 // ----------------------------------------------------------------------------
 // sorting stuff
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // sorting stuff
 // ----------------------------------------------------------------------------


@@ -1970,7 +2167,7 @@ void wxTreeCtrl::SortChildren(const wxTreeItemId& item)
     //     may be why as if you don't use the DECLARE_CLASS/IMPLEMENT_CLASS
     //     combo for your derived wxTreeCtrl if will sort without
     //     OnCompareItems
     //     may be why as if you don't use the DECLARE_CLASS/IMPLEMENT_CLASS
     //     combo for your derived wxTreeCtrl if will sort without
     //     OnCompareItems

-    if ( GetClassInfo() == CLASSINFO(wxTreeCtrl) )
+    if ( GetClassInfo() == wxCLASSINFO(wxTreeCtrl) )

     {
         TreeView_SortChildren(GetHwnd(), HITEM(item), 0);
     }
     {
         TreeView_SortChildren(GetHwnd(), HITEM(item), 0);
     }


@@ -1996,7 +2193,7 @@ bool wxTreeCtrl::MSWShouldPreProcessMessage(WXMSG* msg)
         // conjunction with modifiers
         if ( (msg->wParam == VK_RETURN) && !wxIsAnyModifierDown() )
         {
         // conjunction with modifiers
         if ( (msg->wParam == VK_RETURN) && !wxIsAnyModifierDown() )
         {

-            // we need VK_RETURN to generate wxEVT_COMMAND_TREE_ITEM_ACTIVATED
+            // we need VK_RETURN to generate wxEVT_TREE_ITEM_ACTIVATED

             return false;
         }
     }
             return false;
         }
     }


@@ -2010,7 +2207,7 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id_)
 
     if ( cmd == EN_UPDATE )
     {
 
     if ( cmd == EN_UPDATE )
     {

-        wxCommandEvent event(wxEVT_COMMAND_TEXT_UPDATED, id);
+        wxCommandEvent event(wxEVT_TEXT, id);

         event.SetEventObject( this );
         ProcessCommand(event);
     }
         event.SetEventObject( this );
         ProcessCommand(event);
     }


@@ -2030,17 +2227,434 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id_)
     return true;
 }
 
     return true;
 }
 

-// we hook into WndProc to process WM_MOUSEMOVE/WM_BUTTONUP messages - as we
-// only do it during dragging, minimize wxWin overhead (this is important for
+bool wxTreeCtrl::MSWIsOnItem(unsigned flags) const
+{
+    unsigned mask = TVHT_ONITEM;
+    if ( HasFlag(wxTR_FULL_ROW_HIGHLIGHT) )
+        mask |= TVHT_ONITEMINDENT | TVHT_ONITEMRIGHT;
+
+    return (flags & mask) != 0;
+}
+
+bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)
+{
+    const bool bCtrl = wxIsCtrlDown();
+    const bool bShift = wxIsShiftDown();
+    const HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
+
+    switch ( vkey )
+    {
+        case VK_RETURN:
+        case VK_SPACE:
+            if ( !htSel )
+                break;
+
+            if ( vkey != VK_RETURN && bCtrl )
+            {
+                wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                          this, htSel);
+                changingEvent.m_itemOld = htSel;
+
+                if ( IsTreeEventAllowed(changingEvent) )
+                {
+                    DoToggleItemSelection(wxTreeItemId(htSel));
+
+                    wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                             this, htSel);
+                    changedEvent.m_itemOld = htSel;
+                    (void)HandleTreeEvent(changedEvent);
+                }
+            }
+            else
+            {
+                wxArrayTreeItemIds selections;
+                size_t count = GetSelections(selections);
+
+                if ( count != 1 || HITEM(selections[0]) != htSel )
+                {
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                              this, htSel);
+                    changingEvent.m_itemOld = htSel;
+
+                    if ( IsTreeEventAllowed(changingEvent) )
+                    {
+                        DoUnselectAll();
+                        DoSelectItem(wxTreeItemId(htSel));
+
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                                 this, htSel);
+                        changedEvent.m_itemOld = htSel;
+                        (void)HandleTreeEvent(changedEvent);
+                    }
+                }
+            }
+            break;
+
+        case VK_UP:
+        case VK_DOWN:
+            if ( !bCtrl && !bShift )
+            {
+                wxArrayTreeItemIds selections;
+                wxTreeItemId next;
+
+                if ( htSel )
+                {
+                    next = vkey == VK_UP
+                            ? TreeView_GetPrevVisible(GetHwnd(), htSel)
+                            : TreeView_GetNextVisible(GetHwnd(), htSel);
+                }
+                else
+                {
+                    next = GetRootItem();
+
+                    if ( IsHiddenRoot(next) )
+                        next = TreeView_GetChild(GetHwnd(), HITEM(next));
+                }
+
+                if ( !next.IsOk() )
+                {
+                    break;
+                }
+
+                wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                          this, next);
+                changingEvent.m_itemOld = htSel;
+
+                if ( IsTreeEventAllowed(changingEvent) )
+                {
+                    DoUnselectAll();
+                    DoSelectItem(next);
+                    SetFocusedItem(next);
+
+                    wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                             this, next);
+                    changedEvent.m_itemOld = htSel;
+                    (void)HandleTreeEvent(changedEvent);
+                }
+            }
+            else if ( htSel )
+            {
+                wxTreeItemId next = vkey == VK_UP
+                    ? TreeView_GetPrevVisible(GetHwnd(), htSel)
+                    : TreeView_GetNextVisible(GetHwnd(), htSel);
+
+                if ( !next.IsOk() )
+                {
+                    break;
+                }
+
+                if ( !m_htSelStart )
+                {
+                    m_htSelStart = htSel;
+                }
+
+                if ( bShift && SelectRange(GetHwnd(), HITEM(m_htSelStart), HITEM(next),
+                     SR_UNSELECT_OTHERS | SR_SIMULATE) )
+                {
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);
+                    changingEvent.m_itemOld = htSel;
+
+                    if ( IsTreeEventAllowed(changingEvent) )
+                    {
+                        SelectRange(GetHwnd(), HITEM(m_htSelStart), HITEM(next),
+                                    SR_UNSELECT_OTHERS);
+
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);
+                        changedEvent.m_itemOld = htSel;
+                        (void)HandleTreeEvent(changedEvent);
+                    }
+                }
+
+                SetFocusedItem(next);
+            }
+            break;
+
+        case VK_LEFT:
+            if ( HasChildren(htSel) && IsExpanded(htSel) )
+            {
+                Collapse(htSel);
+            }
+            else
+            {
+                wxTreeItemId next = GetItemParent(htSel);
+
+                if ( next.IsOk() && !IsHiddenRoot(next) )
+                {
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                              this, next);
+                    changingEvent.m_itemOld = htSel;
+
+                    if ( IsTreeEventAllowed(changingEvent) )
+                    {
+                        DoUnselectAll();
+                        DoSelectItem(next);
+                        SetFocusedItem(next);
+
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                                 this, next);
+                        changedEvent.m_itemOld = htSel;
+                        (void)HandleTreeEvent(changedEvent);
+                    }
+                }
+            }
+            break;
+
+        case VK_RIGHT:
+            if ( !IsVisible(htSel) )
+            {
+                EnsureVisible(htSel);
+            }
+
+            if ( !HasChildren(htSel) )
+                break;
+
+            if ( !IsExpanded(htSel) )
+            {
+                Expand(htSel);
+            }
+            else
+            {
+                wxTreeItemId next = TreeView_GetChild(GetHwnd(), htSel);
+
+                wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING, this, next);
+                changingEvent.m_itemOld = htSel;
+
+                if ( IsTreeEventAllowed(changingEvent) )
+                {
+                    DoUnselectAll();
+                    DoSelectItem(next);
+                    SetFocusedItem(next);
+
+                    wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED, this, next);
+                    changedEvent.m_itemOld = htSel;
+                    (void)HandleTreeEvent(changedEvent);
+                }
+            }
+            break;
+
+        case VK_HOME:
+        case VK_END:
+            {
+                wxTreeItemId next = GetRootItem();
+
+                if ( IsHiddenRoot(next) )
+                {
+                    next = TreeView_GetChild(GetHwnd(), HITEM(next));
+                }
+
+                if ( !next.IsOk() )
+                    break;
+
+                if ( vkey == VK_END )
+                {
+                    for ( ;; )
+                    {
+                        wxTreeItemId nextTemp = TreeView_GetNextVisible(
+                                                    GetHwnd(), HITEM(next));
+
+                        if ( !nextTemp.IsOk() )
+                            break;
+
+                        next = nextTemp;
+                    }
+                }
+
+                if ( htSel == HITEM(next) )
+                    break;
+
+                if ( bShift )
+                {
+                    if ( !m_htSelStart )
+                    {
+                        m_htSelStart = htSel;
+                    }
+
+                    if ( SelectRange(GetHwnd(),
+                                     HITEM(m_htSelStart), HITEM(next),
+                                     SR_UNSELECT_OTHERS | SR_SIMULATE) )
+                    {
+                        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                                  this, next);
+                        changingEvent.m_itemOld = htSel;
+
+                        if ( IsTreeEventAllowed(changingEvent) )
+                        {
+                            SelectRange(GetHwnd(),
+                                        HITEM(m_htSelStart), HITEM(next),
+                                        SR_UNSELECT_OTHERS);
+                            SetFocusedItem(next);
+
+                            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                                     this, next);
+                            changedEvent.m_itemOld = htSel;
+                            (void)HandleTreeEvent(changedEvent);
+                        }
+                    }
+                }
+                else // no Shift
+                {
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                              this, next);
+                    changingEvent.m_itemOld = htSel;
+
+                    if ( IsTreeEventAllowed(changingEvent) )
+                    {
+                        DoUnselectAll();
+                        DoSelectItem(next);
+                        SetFocusedItem(next);
+
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                                 this, next);
+                        changedEvent.m_itemOld = htSel;
+                        (void)HandleTreeEvent(changedEvent);
+                    }
+                }
+            }
+            break;
+
+        case VK_PRIOR:
+        case VK_NEXT:
+            if ( bCtrl )
+            {
+                wxTreeItemId firstVisible = GetFirstVisibleItem();
+                size_t visibleCount = TreeView_GetVisibleCount(GetHwnd());
+                wxTreeItemId nextAdjacent = (vkey == VK_PRIOR) ?
+                    TreeView_GetPrevVisible(GetHwnd(), HITEM(firstVisible)) :
+                    TreeView_GetNextVisible(GetHwnd(), HITEM(firstVisible));
+
+                if ( !nextAdjacent )
+                {
+                    break;
+                }
+
+                wxTreeItemId nextStart = firstVisible;
+
+                for ( size_t n = 1; n < visibleCount; n++ )
+                {
+                    wxTreeItemId nextTemp = (vkey == VK_PRIOR) ?
+                        TreeView_GetPrevVisible(GetHwnd(), HITEM(nextStart)) :
+                        TreeView_GetNextVisible(GetHwnd(), HITEM(nextStart));
+
+                    if ( nextTemp.IsOk() )
+                    {
+                        nextStart = nextTemp;
+                    }
+                    else
+                    {
+                        break;
+                    }
+                }
+
+                EnsureVisible(nextStart);
+
+                if ( vkey == VK_NEXT )
+                {
+                    wxTreeItemId nextEnd = nextStart;
+
+                    for ( size_t n = 1; n < visibleCount; n++ )
+                    {
+                        wxTreeItemId nextTemp =
+                            TreeView_GetNextVisible(GetHwnd(), HITEM(nextEnd));
+
+                        if ( nextTemp.IsOk() )
+                        {
+                            nextEnd = nextTemp;
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+
+                    EnsureVisible(nextEnd);
+                }
+            }
+            else // no Ctrl
+            {
+                size_t visibleCount = TreeView_GetVisibleCount(GetHwnd());
+                wxTreeItemId nextAdjacent = (vkey == VK_PRIOR) ?
+                    TreeView_GetPrevVisible(GetHwnd(), htSel) :
+                    TreeView_GetNextVisible(GetHwnd(), htSel);
+
+                if ( !nextAdjacent )
+                {
+                    break;
+                }
+
+                wxTreeItemId next(htSel);
+
+                for ( size_t n = 1; n < visibleCount; n++ )
+                {
+                    wxTreeItemId nextTemp = vkey == VK_PRIOR ?
+                        TreeView_GetPrevVisible(GetHwnd(), HITEM(next)) :
+                        TreeView_GetNextVisible(GetHwnd(), HITEM(next));
+
+                    if ( !nextTemp.IsOk() )
+                        break;
+
+                    next = nextTemp;
+                }
+
+                wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                          this, next);
+                changingEvent.m_itemOld = htSel;
+
+                if ( IsTreeEventAllowed(changingEvent) )
+                {
+                    DoUnselectAll();
+                    m_htSelStart.Unset();
+                    DoSelectItem(next);
+                    SetFocusedItem(next);
+
+                    wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                             this, next);
+                    changedEvent.m_itemOld = htSel;
+                    (void)HandleTreeEvent(changedEvent);
+                }
+            }
+            break;
+
+        default:
+            return false;
+    }
+
+    return true;
+}
+
+bool wxTreeCtrl::MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam)
+{
+    wxTreeEvent keyEvent(wxEVT_TREE_KEY_DOWN, this);
+    keyEvent.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN, wParam, lParam);
+
+    bool processed = HandleTreeEvent(keyEvent);
+
+    // generate a separate event for Space/Return
+    if ( !wxIsCtrlDown() && !wxIsShiftDown() && !wxIsAltDown() &&
+         ((wParam == VK_SPACE) || (wParam == VK_RETURN)) )
+    {
+        const HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
+        if ( htSel )
+        {
+            wxTreeEvent activatedEvent(wxEVT_TREE_ITEM_ACTIVATED,
+                                       this, htSel);
+            (void)HandleTreeEvent(activatedEvent);
+        }
+    }
+
+    return processed;
+}
+
+// we hook into WndProc to process WM_MOUSEMOVE/WM_BUTTONUP messages - as we
+// only do it during dragging, minimize wxWin overhead (this is important for

 // WM_MOUSEMOVE as they're a lot of them) by catching Windows messages directly
 // instead of passing by wxWin events
 // WM_MOUSEMOVE as they're a lot of them) by catching Windows messages directly
 // instead of passing by wxWin events

-WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT
+wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)

 {
     bool processed = false;
     WXLRESULT rc = 0;
     bool isMultiple = HasFlag(wxTR_MULTIPLE);
 
 {
     bool processed = false;
     WXLRESULT rc = 0;
     bool isMultiple = HasFlag(wxTR_MULTIPLE);
 

-    // This message is sent after a right-click, or when the "menu" key is pressed

     if ( nMsg == WM_CONTEXTMENU )
     {
         int x = GET_X_LPARAM(lParam),
     if ( nMsg == WM_CONTEXTMENU )
     {
         int x = GET_X_LPARAM(lParam),


@@ -2076,18 +2690,22 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
             TV_HITTESTINFO tvhti;
             tvhti.pt.x = pt.x;
             tvhti.pt.y = pt.y;
             TV_HITTESTINFO tvhti;
             tvhti.pt.x = pt.x;
             tvhti.pt.y = pt.y;

+

             if ( TreeView_HitTest(GetHwnd(), &tvhti) )
                 item = wxTreeItemId(tvhti.hItem);
         }
 
         // create the event
             if ( TreeView_HitTest(GetHwnd(), &tvhti) )
                 item = wxTreeItemId(tvhti.hItem);
         }
 
         // create the event

-        wxTreeEvent event(wxEVT_COMMAND_TREE_ITEM_MENU, this, item);
+        if ( item.IsOk() )
+        {
+            wxTreeEvent event(wxEVT_TREE_ITEM_MENU, this, item);

 
 

-        event.m_pointDrag = pt;
+            event.m_pointDrag = pt;

 
 

-        if ( HandleWindowEvent(event) )
-            processed = true;
-        //else: continue with generating wxEVT_CONTEXT_MENU in base class code
+            if ( HandleTreeEvent(event) )
+                processed = true;
+            //else: continue with generating wxEVT_CONTEXT_MENU in base class code
+        }

     }
     else if ( (nMsg >= WM_MOUSEFIRST) && (nMsg <= WM_MOUSELAST) )
     {
     }
     else if ( (nMsg >= WM_MOUSEFIRST) && (nMsg <= WM_MOUSELAST) )
     {


@@ -2100,129 +2718,255 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
         tvht.pt.x = x;
         tvht.pt.y = y;
 
         tvht.pt.x = x;
         tvht.pt.y = y;
 

+        HTREEITEM htOldItem = TreeView_GetSelection(GetHwnd());

         HTREEITEM htItem = TreeView_HitTest(GetHwnd(), &tvht);
 
         switch ( nMsg )
         {
             case WM_LBUTTONDOWN:
         HTREEITEM htItem = TreeView_HitTest(GetHwnd(), &tvht);
 
         switch ( nMsg )
         {
             case WM_LBUTTONDOWN:

-                if ( htItem && isMultiple && (tvht.flags & TVHT_ONITEM) != 0 )
-                {
-                    m_htClickedItem = (WXHTREEITEM) htItem;
-                    m_ptClick = wxPoint(x, y);
+                if ( !isMultiple )
+                    break;
+
+                m_htClickedItem.Unset();

 
 

-                    if ( wParam & MK_CONTROL )
+                if ( !MSWIsOnItem(tvht.flags) )
+                {
+                    if ( tvht.flags & TVHT_ONITEMBUTTON )

                     {
                     {

+                        // either it's going to be handled by user code or
+                        // we're going to use it ourselves to toggle the
+                        // branch, in either case don't pass it to the base
+                        // class which would generate another mouse click event
+                        // for it even though it's already handled here
+                        processed = true;

                         SetFocus();
 
                         SetFocus();
 

+                        if ( !HandleMouseEvent(nMsg, x, y, wParam) )
+                        {
+                            if ( !IsExpanded(htItem) )
+                            {
+                                Expand(htItem);
+                            }
+                            else
+                            {
+                                Collapse(htItem);
+                            }
+                        }
+                    }
+
+                    m_focusLost = false;
+                    break;
+                }
+
+                processed = true;
+                SetFocus();
+                m_htClickedItem = (WXHTREEITEM) htItem;
+                m_ptClick = wxPoint(x, y);
+
+                if ( wParam & MK_CONTROL )
+                {
+                    if ( HandleMouseEvent(nMsg, x, y, wParam) )
+                    {
+                        m_htClickedItem.Unset();
+                        break;
+                    }
+
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                              this, htItem);
+                    changingEvent.m_itemOld = htOldItem;
+
+                    if ( IsTreeEventAllowed(changingEvent) )
+                    {

                         // toggle selected state
                         // toggle selected state

-                        ToggleItemSelection(htItem);
+                        DoToggleItemSelection(wxTreeItemId(htItem));

 
 

-                        ::SetFocus(GetHwnd(), htItem);
+                        SetFocusedItem(wxTreeItemId(htItem));

 
                         // reset on any click without Shift
                         m_htSelStart.Unset();
 
 
                         // reset on any click without Shift
                         m_htSelStart.Unset();
 

-                        processed = true;
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                                 this, htItem);
+                        changedEvent.m_itemOld = htOldItem;
+                        (void)HandleTreeEvent(changedEvent);

                     }
                     }

-                    else if ( wParam & MK_SHIFT )
+                }
+                else if ( wParam & MK_SHIFT )
+                {
+                    if ( HandleMouseEvent(nMsg, x, y, wParam) )

                     {
                     {

-                        // this selects all items between the starting one and
-                        // the current
-
-                        if ( !m_htSelStart )
-                        {
-                            // take the focused item
-                            m_htSelStart = TreeView_GetSelection(GetHwnd());
-                        }
+                        m_htClickedItem.Unset();
+                        break;
+                    }

 
 

-                        if ( m_htSelStart )
-                            SelectRange(GetHwnd(), HITEM(m_htSelStart), htItem,
-                                    !(wParam & MK_CONTROL));
-                        else
-                            ::SelectItem(GetHwnd(), htItem);
+                    int srFlags = 0;
+                    bool willChange = true;

 
 

-                        ::SetFocus(GetHwnd(), htItem);
+                    if ( !(wParam & MK_CONTROL) )
+                    {
+                        srFlags |= SR_UNSELECT_OTHERS;
+                    }

 
 

-                        processed = true;
+                    if ( !m_htSelStart )
+                    {
+                        // take the focused item
+                        m_htSelStart = htOldItem;

                     }
                     }

-                    else // normal click
+                    else

                     {
                     {

-                        // avoid doing anything if we click on the only
-                        // currently selected item
+                        willChange = SelectRange(GetHwnd(), HITEM(m_htSelStart),
+                                                 htItem, srFlags | SR_SIMULATE);
+                    }

 
 

-                        SetFocus();
+                    if ( willChange )
+                    {
+                        wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                                  this, htItem);
+                        changingEvent.m_itemOld = htOldItem;

 
 

-                        wxArrayTreeItemIds selections;
-                        size_t count = GetSelections(selections);
-                        if ( count == 0 ||
-                             count > 1 ||
-                             HITEM(selections[0]) != htItem )
+                        if ( IsTreeEventAllowed(changingEvent) )

                         {
                         {

-                            // clear the previously selected items, if the
-                            // user clicked outside of the present selection.
-                            // otherwise, perform the deselection on mouse-up.
-                            // this allows multiple drag and drop to work.
-
-                            if (!IsItemSelected(GetHwnd(), htItem))
+                            // this selects all items between the starting one
+                            // and the current
+                            if ( m_htSelStart )

                             {
                             {

-                                UnselectAll();
+                                SelectRange(GetHwnd(), HITEM(m_htSelStart),
+                                            htItem, srFlags);
+                            }
+                            else
+                            {
+                                DoSelectItem(wxTreeItemId(htItem));
+                            }

 
 

-                                // prevent the click from starting in-place editing
-                                // which should only happen if we click on the
-                                // already selected item (and nothing else is
-                                // selected)
+                            SetFocusedItem(wxTreeItemId(htItem));

 
 

-                                TreeView_SelectItem(GetHwnd(), 0);
-                                ::SelectItem(GetHwnd(), htItem);
-                            }
-                            ::SetFocus(GetHwnd(), htItem);
-                            processed = true;
+                            wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                                     this, htItem);
+                            changedEvent.m_itemOld = htOldItem;
+                            (void)HandleTreeEvent(changedEvent);

                         }
                         }

-                        else // click on a single selected item
+                    }
+                }
+                else // normal click
+                {
+                    // avoid doing anything if we click on the only
+                    // currently selected item
+
+                    wxArrayTreeItemIds selections;
+                    size_t count = GetSelections(selections);
+
+                    if ( count == 0 ||
+                         count > 1 ||
+                         HITEM(selections[0]) != htItem )
+                    {
+                        if ( HandleMouseEvent(nMsg, x, y, wParam) )

                         {
                         {

-                            // don't interfere with the default processing in
-                            // WM_MOUSEMOVE handler below as the default window
-                            // proc will start the drag itself if we let have
-                            // WM_LBUTTONDOWN

                             m_htClickedItem.Unset();
                             m_htClickedItem.Unset();

+                            break;

                         }
 
                         }
 

-                        // reset on any click without Shift
-                        m_htSelStart.Unset();
+                        // clear the previously selected items, if the user
+                        // clicked outside of the present selection, otherwise,
+                        // perform the deselection on mouse-up, this allows
+                        // multiple drag and drop to work.
+                        if ( !IsItemSelected(GetHwnd(), htItem))
+                        {
+                            wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                                      this, htItem);
+                            changingEvent.m_itemOld = htOldItem;
+
+                            if ( IsTreeEventAllowed(changingEvent) )
+                            {
+                                DoUnselectAll();
+                                DoSelectItem(wxTreeItemId(htItem));
+                                SetFocusedItem(wxTreeItemId(htItem));
+
+                                wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                                         this, htItem);
+                                changedEvent.m_itemOld = htOldItem;
+                                (void)HandleTreeEvent(changedEvent);
+                            }
+                        }
+                        else
+                        {
+                            SetFocusedItem(wxTreeItemId(htItem));
+                            m_mouseUpDeselect = true;
+                        }
+                    }
+                    else // click on a single selected item
+                    {
+                        // don't interfere with the default processing in
+                        // WM_MOUSEMOVE handler below as the default window
+                        // proc will start the drag itself if we let have
+                        // WM_LBUTTONDOWN
+                        m_htClickedItem.Unset();
+
+                        // prevent in-place editing from starting if focus lost
+                        // since previous click
+                        if ( m_focusLost )
+                        {
+                            ClearFocusedItem();
+                            DoSelectItem(wxTreeItemId(htItem));
+                            SetFocusedItem(wxTreeItemId(htItem));
+                        }
+                        else
+                        {
+                            processed = false;
+                        }
+                    }
+
+                    // reset on any click without Shift
+                    m_htSelStart.Unset();
+                }
+
+                m_focusLost = false;
+
+                // we consumed the event so we need to trigger state image
+                // click if needed
+                if ( processed )
+                {
+                    if ( tvht.flags & TVHT_ONITEMSTATEICON )
+                    {
+                        m_triggerStateImageClick = true;

                     }
                 }
                 break;
 
             case WM_RBUTTONDOWN:
                     }
                 }
                 break;
 
             case WM_RBUTTONDOWN:

+                if ( !isMultiple )
+                    break;
+
+                processed = true;
+                SetFocus();
+
+                if ( HandleMouseEvent(nMsg, x, y, wParam) || !htItem )
+                {
+                    break;
+                }
+

                 // default handler removes the highlight from the currently
                 // focused item when right mouse button is pressed on another
                 // one but keeps the remaining items highlighted, which is
                 // default handler removes the highlight from the currently
                 // focused item when right mouse button is pressed on another
                 // one but keeps the remaining items highlighted, which is

-                // confusing, so override this default behaviour for tree with
-                // multiple selections
-                if ( isMultiple )
+                // confusing, so override this default behaviour
+                if ( !IsItemSelected(GetHwnd(), htItem) )

                 {
                 {

-                    if ( !IsItemSelected(GetHwnd(), htItem) )
+                    wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                              this, htItem);
+                    changingEvent.m_itemOld = htOldItem;
+
+                    if ( IsTreeEventAllowed(changingEvent) )

                     {
                     {

-                        UnselectAll();
-                        SelectItem(htItem);
-                        ::SetFocus(GetHwnd(), htItem);
+                        DoUnselectAll();
+                        DoSelectItem(wxTreeItemId(htItem));
+                        SetFocusedItem(wxTreeItemId(htItem));
+
+                        wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                                 this, htItem);
+                        changedEvent.m_itemOld = htOldItem;
+                        (void)HandleTreeEvent(changedEvent);

                     }
                     }

-
-                    // fire EVT_RIGHT_DOWN
-                    HandleMouseEvent(nMsg, x, y, wParam);
-
-                    // send NM_RCLICK
-                    NMHDR nmhdr;
-                    nmhdr.hwndFrom = GetHwnd();
-                    nmhdr.idFrom = ::GetWindowLong(GetHwnd(), GWL_ID);
-                    nmhdr.code = NM_RCLICK;
-                    ::SendMessage(::GetParent(GetHwnd()), WM_NOTIFY,
-                                  nmhdr.idFrom, (LPARAM)&nmhdr);
-
-                    // prevent tree control default processing, as we've
-                    // already done everything
-                    processed = true;

                 }
                 }

+

                 break;
 
             case WM_MOUSEMOVE:
                 break;
 
             case WM_MOUSEMOVE:


@@ -2291,23 +3035,52 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
                 break;
 
             case WM_LBUTTONUP:
                 break;
 
             case WM_LBUTTONUP:

-
-                // facilitates multiple drag-and-drop
-                if (htItem && isMultiple)
+                if ( isMultiple )

                 {
                 {

-                    wxArrayTreeItemIds selections;
-                    size_t count = GetSelections(selections);
-
-                    if (count > 1 &&
-                        !(wParam & MK_CONTROL) &&
-                        !(wParam & MK_SHIFT))
+                    // deselect other items if needed
+                    if ( htItem )

                     {
                     {

-                        UnselectAll();
-                        TreeView_SelectItem(GetHwnd(), htItem);
-                        ::SelectItem(GetHwnd(), htItem);
-                        ::SetFocus(GetHwnd(), htItem);
+                        if ( m_mouseUpDeselect )
+                        {
+                            m_mouseUpDeselect = false;
+
+                            wxTreeEvent changingEvent(wxEVT_TREE_SEL_CHANGING,
+                                                      this, htItem);
+                            changingEvent.m_itemOld = htOldItem;
+
+                            if ( IsTreeEventAllowed(changingEvent) )
+                            {
+                                DoUnselectAll();
+                                DoSelectItem(wxTreeItemId(htItem));
+                                SetFocusedItem(wxTreeItemId(htItem));
+
+                                wxTreeEvent changedEvent(wxEVT_TREE_SEL_CHANGED,
+                                                         this, htItem);
+                                changedEvent.m_itemOld = htOldItem;
+                                (void)HandleTreeEvent(changedEvent);
+                            }
+                        }

                     }
                     }

+

                     m_htClickedItem.Unset();
                     m_htClickedItem.Unset();

+
+                    if ( m_triggerStateImageClick )
+                    {
+                        if ( tvht.flags & TVHT_ONITEMSTATEICON )
+                        {
+                            wxTreeEvent event(wxEVT_TREE_STATE_IMAGE_CLICK,
+                                              this, htItem);
+                            (void)HandleTreeEvent(event);
+
+                            m_triggerStateImageClick = false;
+                            processed = true;
+                        }
+                    }
+
+                    if ( !m_dragStarted && MSWIsOnItem(tvht.flags) )
+                    {
+                        processed = true;
+                    }

                 }
 
                 // fall through
                 }
 
                 // fall through


@@ -2317,121 +3090,99 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
                 if ( m_dragImage )
                 {
                     m_dragImage->EndDrag();
                 if ( m_dragImage )
                 {
                     m_dragImage->EndDrag();

-                    delete m_dragImage;
-                    m_dragImage = NULL;
+                    wxDELETE(m_dragImage);

 
                     // generate the drag end event
 
                     // generate the drag end event

-                    wxTreeEvent event(wxEVT_COMMAND_TREE_END_DRAG, this, htItem);
+                    wxTreeEvent event(wxEVT_TREE_END_DRAG,
+                                      this, htItem);

                     event.m_pointDrag = wxPoint(x, y);
                     event.m_pointDrag = wxPoint(x, y);

-
-                    (void)HandleWindowEvent(event);
+                    (void)HandleTreeEvent(event);

 
                     // if we don't do it, the tree seems to think that 2 items
                     // are selected simultaneously which is quite weird
                     TreeView_SelectDropTarget(GetHwnd(), 0);
                 }
 #endif // wxUSE_DRAGIMAGE
 
                     // if we don't do it, the tree seems to think that 2 items
                     // are selected simultaneously which is quite weird
                     TreeView_SelectDropTarget(GetHwnd(), 0);
                 }
 #endif // wxUSE_DRAGIMAGE

+
+                if ( isMultiple && nMsg == WM_RBUTTONUP )
+                {
+                    // send NM_RCLICK
+                    NMHDR nmhdr;
+                    nmhdr.hwndFrom = GetHwnd();
+                    nmhdr.idFrom = ::GetWindowLong(GetHwnd(), GWL_ID);
+                    nmhdr.code = NM_RCLICK;
+                    ::SendMessage(::GetParent(GetHwnd()), WM_NOTIFY,
+                                  nmhdr.idFrom, (LPARAM)&nmhdr);
+                    processed = true;
+                }
+
+                m_dragStarted = false;
+

                 break;
         }
     }
                 break;
         }
     }

-    else if ( (nMsg == WM_SETFOCUS || nMsg == WM_KILLFOCUS) && isMultiple )
+    else if ( (nMsg == WM_SETFOCUS || nMsg == WM_KILLFOCUS) )

     {
     {

-        // the tree control greys out the selected item when it loses focus and
-        // paints it as selected again when it regains it, but it won't do it
-        // for the other items itself - help it
-        wxArrayTreeItemIds selections;
-        size_t count = GetSelections(selections);
-        RECT rect;
-        for ( size_t n = 0; n < count; n++ )
+        if ( isMultiple )

         {
         {

-            // TreeView_GetItemRect() will return false if item is not visible,
-            // which may happen perfectly well
-            if ( TreeView_GetItemRect(GetHwnd(), HITEM(selections[n]),
-                                      &rect, TRUE) )
+            // the tree control greys out the selected item when it loses focus
+            // and paints it as selected again when it regains it, but it won't
+            // do it for the other items itself - help it
+            wxArrayTreeItemIds selections;
+            size_t count = GetSelections(selections);
+            TVGetItemRectParam param;
+
+            for ( size_t n = 0; n < count; n++ )

             {
             {

-                ::InvalidateRect(GetHwnd(), &rect, FALSE);
+                // TreeView_GetItemRect() will return false if item is not
+                // visible, which may happen perfectly well
+                if ( wxTreeView_GetItemRect(GetHwnd(), HITEM(selections[n]),
+                                            param, TRUE) )
+                {
+                    ::InvalidateRect(GetHwnd(), &param.rect, FALSE);
+                }

             }
         }
             }
         }

+
+        if ( nMsg == WM_KILLFOCUS )
+        {
+            m_focusLost = true;
+        }

     }
     }

-    else if ( nMsg == WM_KEYDOWN && isMultiple )
+    else if ( (nMsg == WM_KEYDOWN || nMsg == WM_SYSKEYDOWN) && isMultiple )

     {
     {

-        bool bCtrl = wxIsCtrlDown(),
-             bShift = wxIsShiftDown();
-
-        HTREEITEM htSel = (HTREEITEM)TreeView_GetSelection(GetHwnd());
+        // normally we want to generate wxEVT_KEY_DOWN events from TVN_KEYDOWN
+        // notification but for the keys which can be used to change selection
+        // we need to do it from here so as to not apply the default behaviour
+        // if the events are handled by the user code

         switch ( wParam )
         {
         switch ( wParam )
         {

+            case VK_RETURN:

             case VK_SPACE:
             case VK_SPACE:

-                if ( bCtrl )
-                {
-                    ToggleItemSelection(htSel);
-                }
-                else
-                {
-                    UnselectAll();
-
-                    ::SelectItem(GetHwnd(), htSel);
-                }
-
-                processed = true;
-                break;
-

             case VK_UP:
             case VK_DOWN:
             case VK_UP:
             case VK_DOWN:

-                if ( !bCtrl && !bShift )
-                {
-                    // no modifiers, just clear selection and then let the default
-                    // processing to take place
-                    UnselectAll();
-                }
-                else if ( htSel )
-                {
-                    (void)wxControl::MSWWindowProc(nMsg, wParam, lParam);
-
-                    HTREEITEM htNext = (HTREEITEM)
-                        TreeView_GetNextItem
-                        (
-                            GetHwnd(),
-                            htSel,
-                            wParam == VK_UP ? TVGN_PREVIOUSVISIBLE
-                                            : TVGN_NEXTVISIBLE
-                        );
-
-                    if ( !htNext )
-                    {
-                        // at the top/bottom
-                        htNext = htSel;
-                    }
-
-                    if ( bShift )
-                    {
-                        if ( !m_htSelStart )
-                            m_htSelStart = htSel;
-
-                        SelectRange(GetHwnd(), HITEM(m_htSelStart), htNext);
-                    }
-                    else // bCtrl
-                    {
-                        // without changing selection
-                        ::SetFocus(GetHwnd(), htNext);
-                    }
-
-                    processed = true;
-                }
-                break;
-
+            case VK_LEFT:
+            case VK_RIGHT:

             case VK_HOME:
             case VK_END:
             case VK_PRIOR:
             case VK_NEXT:
             case VK_HOME:
             case VK_END:
             case VK_PRIOR:
             case VK_NEXT:

-                // TODO: handle Shift/Ctrl with these keys
-                if ( !bCtrl && !bShift )
+                if ( !HandleKeyDown(wParam, lParam) &&
+                        !MSWHandleTreeKeyDownEvent(wParam, lParam) )

                 {
                 {

-                    UnselectAll();
-
-                    m_htSelStart.Unset();
+                    // use the key to update the selection if it was left
+                    // unprocessed
+                    MSWHandleSelectionKey(wParam);

                 }
                 }

+
+                // pretend that we did process it in any case as we already
+                // generated an event for it
+                processed = true;
+
+            //default: for all the other keys leave processed as false so that
+            //         the tree control generates a TVN_KEYDOWN for us

         }
         }

+

     }
     else if ( nMsg == WM_COMMAND )
     {
     }
     else if ( nMsg == WM_COMMAND )
     {


@@ -2479,8 +3230,7 @@ wxTreeCtrl::MSWDefWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             if ( m_dragImage )
             {
                 m_dragImage->EndDrag();
             if ( m_dragImage )
             {
                 m_dragImage->EndDrag();

-                delete m_dragImage;
-                m_dragImage = NULL;
+                wxDELETE(m_dragImage);

 
                 // if we don't do it, the tree seems to think that 2 items
                 // are selected simultaneously which is quite weird
 
                 // if we don't do it, the tree seems to think that 2 items
                 // are selected simultaneously which is quite weird


@@ -2503,13 +3253,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
     switch ( hdr->code )
     {
         case TVN_BEGINDRAG:
     switch ( hdr->code )
     {
         case TVN_BEGINDRAG:

-            eventType = wxEVT_COMMAND_TREE_BEGIN_DRAG;
+            eventType = wxEVT_TREE_BEGIN_DRAG;

             // fall through
 
         case TVN_BEGINRDRAG:
             {
                 if ( eventType == wxEVT_NULL )
             // fall through
 
         case TVN_BEGINRDRAG:
             {
                 if ( eventType == wxEVT_NULL )

-                    eventType = wxEVT_COMMAND_TREE_BEGIN_RDRAG;
+                    eventType = wxEVT_TREE_BEGIN_RDRAG;

                 //else: left drag, already set above
 
                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
                 //else: left drag, already set above
 
                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;


@@ -2526,7 +3276,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_BEGINLABELEDIT:
             {
 
         case TVN_BEGINLABELEDIT:
             {

-                eventType = wxEVT_COMMAND_TREE_BEGIN_LABEL_EDIT;
+                eventType = wxEVT_TREE_BEGIN_LABEL_EDIT;

                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 // although the user event handler may still veto it, it is
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 // although the user event handler may still veto it, it is


@@ -2541,7 +3291,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_DELETEITEM:
             {
 
         case TVN_DELETEITEM:
             {

-                eventType = wxEVT_COMMAND_TREE_DELETE_ITEM;
+                eventType = wxEVT_TREE_DELETE_ITEM;

                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
 
                 event.m_item = tv->itemOld.hItem;
                 NM_TREEVIEW *tv = (NM_TREEVIEW *)lParam;
 
                 event.m_item = tv->itemOld.hItem;


@@ -2560,7 +3310,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_ENDLABELEDIT:
             {
 
         case TVN_ENDLABELEDIT:
             {

-                eventType = wxEVT_COMMAND_TREE_END_LABEL_EDIT;
+                eventType = wxEVT_TREE_END_LABEL_EDIT;

                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 event.m_item = info->item.hItem;
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
 
                 event.m_item = info->item.hItem;


@@ -2584,7 +3334,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 #ifdef TVN_GETINFOTIP
         case TVN_GETINFOTIP:
             {
 #ifdef TVN_GETINFOTIP
         case TVN_GETINFOTIP:
             {

-                eventType = wxEVT_COMMAND_TREE_ITEM_GETTOOLTIP;
+                eventType = wxEVT_TREE_ITEM_GETTOOLTIP;

                 NMTVGETINFOTIP *info = (NMTVGETINFOTIP*)lParam;
 
                 // Which item are we trying to get a tooltip for?
                 NMTVGETINFOTIP *info = (NMTVGETINFOTIP*)lParam;
 
                 // Which item are we trying to get a tooltip for?


@@ -2596,13 +3346,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 #endif // !__WXWINCE__
 
         case TVN_GETDISPINFO:
 #endif // !__WXWINCE__
 
         case TVN_GETDISPINFO:

-            eventType = wxEVT_COMMAND_TREE_GET_INFO;
+            eventType = wxEVT_TREE_GET_INFO;

             // fall through
 
         case TVN_SETDISPINFO:
             {
                 if ( eventType == wxEVT_NULL )
             // fall through
 
         case TVN_SETDISPINFO:
             {
                 if ( eventType == wxEVT_NULL )

-                    eventType = wxEVT_COMMAND_TREE_SET_INFO;
+                    eventType = wxEVT_TREE_SET_INFO;

                 //else: get, already set above
 
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;
                 //else: get, already set above
 
                 TV_DISPINFO *info = (TV_DISPINFO *)lParam;


@@ -2643,43 +3393,14 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_KEYDOWN:
             {
 
         case TVN_KEYDOWN:
             {

-                eventType = wxEVT_COMMAND_TREE_KEY_DOWN;

                 TV_KEYDOWN *info = (TV_KEYDOWN *)lParam;
 
                 // fabricate the lParam and wParam parameters sufficiently
                 // similar to the ones from a "real" WM_KEYDOWN so that
                 // CreateKeyEvent() works correctly
                 TV_KEYDOWN *info = (TV_KEYDOWN *)lParam;
 
                 // fabricate the lParam and wParam parameters sufficiently
                 // similar to the ones from a "real" WM_KEYDOWN so that
                 // CreateKeyEvent() works correctly

-                WXLPARAM lParam = (wxIsAltDown() ? KF_ALTDOWN : 0) << 16;
-
-                WXWPARAM wParam = info->wVKey;
-
-                int keyCode = wxCharCodeMSWToWX(wParam);
-                if ( !keyCode )
-                {
-                    // wxCharCodeMSWToWX() returns 0 to indicate that this is a
-                    // simple ASCII key
-                    keyCode = wParam;
-                }
-
-                event.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN,
-                                                keyCode,
-                                                lParam,
-                                                wParam);
-
-                // a separate event for Space/Return
-                if ( !wxIsAnyModifierDown() &&
-                     ((info->wVKey == VK_SPACE) || (info->wVKey == VK_RETURN)) )
-                {
-                   wxTreeItemId item;
-                   if ( !HasFlag(wxTR_MULTIPLE) )
-                       item = GetSelection();
-
-                   wxTreeEvent event2(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
-                                        this, item);
-                   (void)HandleWindowEvent(event2);
-                }
+                return MSWHandleTreeKeyDownEvent(
+                        info->wVKey, (wxIsAltDown() ? KF_ALTDOWN : 0) << 16);

             }
             }

-            break;

 
 
         // Vista's tree control has introduced some problems with our
 
 
         // Vista's tree control has introduced some problems with our


@@ -2687,7 +3408,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         // the wrong items are deselected.
 
         // Fortunately, Vista provides a new notification, TVN_ITEMCHANGING
         // the wrong items are deselected.
 
         // Fortunately, Vista provides a new notification, TVN_ITEMCHANGING

-        // that can be used to regulate this incorrect behavior.  The
+        // that can be used to regulate this incorrect behaviour.  The

         // following messages will allow only the unlocked item's selection
         // state to change
 
         // following messages will allow only the unlocked item's selection
         // state to change
 


@@ -2717,14 +3438,18 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         //     we have to handle both messages:
         case TVN_SELCHANGEDA:
         case TVN_SELCHANGEDW:
         //     we have to handle both messages:
         case TVN_SELCHANGEDA:
         case TVN_SELCHANGEDW:

-            eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;
+            if ( !m_changingSelection )
+            {
+                eventType = wxEVT_TREE_SEL_CHANGED;
+            }

             // fall through
 
         case TVN_SELCHANGINGA:
         case TVN_SELCHANGINGW:
             // fall through
 
         case TVN_SELCHANGINGA:
         case TVN_SELCHANGINGW:

+            if ( !m_changingSelection )

             {
                 if ( eventType == wxEVT_NULL )
             {
                 if ( eventType == wxEVT_NULL )

-                    eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
+                    eventType = wxEVT_TREE_SEL_CHANGING;

                 //else: already set above
 
                 if (hdr->code == TVN_SELCHANGINGW ||
                 //else: already set above
 
                 if (hdr->code == TVN_SELCHANGINGW ||


@@ -2753,12 +3478,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             //
             // to avoid such surprises, we force the generation of focus events
             // now, before we generate the selection change ones
             //
             // to avoid such surprises, we force the generation of focus events
             // now, before we generate the selection change ones

-            SetFocus();
+            if ( !m_changingSelection && !m_isBeingDeleted )
+                SetFocus();

             break;
 
             break;
 

-            // instead of explicitly checking for _WIN32_IE, check if the
-            // required symbols are available in the headers
-#if defined(CDDS_PREPAINT) && !wxUSE_COMCTL32_SAFELY
+        // instead of explicitly checking for _WIN32_IE, check if the
+        // required symbols are available in the headers
+#if defined(CDDS_PREPAINT)

         case NM_CUSTOMDRAW:
             {
                 LPNMTVCUSTOMDRAW lptvcd = (LPNMTVCUSTOMDRAW)lParam;
         case NM_CUSTOMDRAW:
             {
                 LPNMTVCUSTOMDRAW lptvcd = (LPNMTVCUSTOMDRAW)lParam;


@@ -2770,6 +3496,71 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                         // notify us before painting each item
                         *result = m_hasAnyAttr ? CDRF_NOTIFYITEMDRAW
                                                : CDRF_DODEFAULT;
                         // notify us before painting each item
                         *result = m_hasAnyAttr ? CDRF_NOTIFYITEMDRAW
                                                : CDRF_DODEFAULT;

+
+                        // windows in TreeCtrl use one-based index for item state images,
+                        // 0 indexed image is not being used, we're using zero-based index,
+                        // so we have to add temp image (of zero index) to state image list
+                        // before we draw any item, then after items are drawn we have to
+                        // delete it (in POSTPAINT notify)
+                        if (m_imageListState && m_imageListState->GetImageCount() > 0)
+                        {
+                            typedef BOOL (wxSTDCALL *ImageList_Copy_t)
+                                (HIMAGELIST, int, HIMAGELIST, int, UINT);
+                            static ImageList_Copy_t s_pfnImageList_Copy = NULL;
+                            static bool loaded = false;
+
+                            if ( !loaded )
+                            {
+                                wxLoadedDLL dllComCtl32(wxT("comctl32.dll"));
+                                if ( dllComCtl32.IsLoaded() )
+                                {
+                                    wxDL_INIT_FUNC(s_pfn, ImageList_Copy, dllComCtl32);
+                                    loaded = true;
+                                }
+                            }
+
+                            if ( !s_pfnImageList_Copy )
+                            {
+                                // this code is broken with ImageList_Copy()
+                                // but I don't care enough about Win95 support
+                                // to write it now -- if anybody does, please
+                                // do it
+                                wxFAIL_MSG("TODO: implement this for Win95");
+                                break;
+                            }
+
+                            const HIMAGELIST
+                                hImageList = GetHimagelistOf(m_imageListState);
+
+                            // add temporary image
+                            int width, height;
+                            m_imageListState->GetSize(0, width, height);
+
+                            HBITMAP hbmpTemp = ::CreateBitmap(width, height, 1, 1, NULL);
+                            int index = ::ImageList_Add(hImageList, hbmpTemp, hbmpTemp);
+                            ::DeleteObject(hbmpTemp);
+
+                            if ( index != -1 )
+                            {
+                                // move images to right
+                                for ( int i = index; i > 0; i-- )
+                                {
+                                    (*s_pfnImageList_Copy)(hImageList, i,
+                                                           hImageList, i-1,
+                                                           ILCF_MOVE);
+                                }
+
+                                // we must remove the image in POSTPAINT notify
+                                *result |= CDRF_NOTIFYPOSTPAINT;
+                            }
+                        }
+                        break;
+
+                    case CDDS_POSTPAINT:
+                        // we are deleting temp image of 0 index, which was
+                        // added before items were drawn (in PREPAINT notify)
+                        if (m_imageListState && m_imageListState->GetImageCount() > 0)
+                            m_imageListState->Remove(0);

                         break;
 
                     case CDDS_ITEMPREPAINT:
                         break;
 
                     case CDDS_ITEMPREPAINT:


@@ -2851,13 +3642,15 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 point.x = LOWORD(pos);
                 point.y = HIWORD(pos);
                 ::MapWindowPoints(HWND_DESKTOP, GetHwnd(), &point, 1);
                 point.x = LOWORD(pos);
                 point.y = HIWORD(pos);
                 ::MapWindowPoints(HWND_DESKTOP, GetHwnd(), &point, 1);

-                int flags = 0;
-                wxTreeItemId item = HitTest(wxPoint(point.x, point.y), flags);
-                if (flags & wxTREE_HITTEST_ONITEMSTATEICON)
+                int htFlags = 0;
+                wxTreeItemId item = HitTest(wxPoint(point.x, point.y), htFlags);
+
+                if ( htFlags & wxTREE_HITTEST_ONITEMSTATEICON )

                 {
                     event.m_item = item;
                 {
                     event.m_item = item;

-                    eventType = wxEVT_COMMAND_TREE_STATE_IMAGE_CLICK;
+                    eventType = wxEVT_TREE_STATE_IMAGE_CLICK;

                 }
                 }

+

                 break;
             }
 
                 break;
             }
 


@@ -2865,16 +3658,16 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
         case NM_RCLICK:
             {
                 TV_HITTESTINFO tvhti;
         case NM_RCLICK:
             {
                 TV_HITTESTINFO tvhti;

-                ::GetCursorPos(&tvhti.pt);
+                wxGetCursorPosMSW(&tvhti.pt);

                 ::ScreenToClient(GetHwnd(), &tvhti.pt);
                 if ( TreeView_HitTest(GetHwnd(), &tvhti) )
                 {
                 ::ScreenToClient(GetHwnd(), &tvhti.pt);
                 if ( TreeView_HitTest(GetHwnd(), &tvhti) )
                 {

-                    if ( tvhti.flags & TVHT_ONITEM )
+                    if ( MSWIsOnItem(tvhti.flags) )

                     {
                         event.m_item = tvhti.hItem;
                         eventType = (int)hdr->code == NM_DBLCLK
                     {
                         event.m_item = tvhti.hItem;
                         eventType = (int)hdr->code == NM_DBLCLK

-                                    ? wxEVT_COMMAND_TREE_ITEM_ACTIVATED
-                                    : wxEVT_COMMAND_TREE_ITEM_RIGHT_CLICK;
+                                    ? wxEVT_TREE_ITEM_ACTIVATED
+                                    : wxEVT_TREE_ITEM_RIGHT_CLICK;

 
                         event.m_pointDrag.x = tvhti.pt.x;
                         event.m_pointDrag.y = tvhti.pt.y;
 
                         event.m_pointDrag.x = tvhti.pt.x;
                         event.m_pointDrag.y = tvhti.pt.y;


@@ -2891,20 +3684,18 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
     event.SetEventType(eventType);
 
 
     event.SetEventType(eventType);
 

-    if ( event.m_item.IsOk() )
-        event.SetClientObject(GetItemData(event.m_item));
-
-    bool processed = HandleWindowEvent(event);
+    bool processed = HandleTreeEvent(event);

 
     // post processing
     switch ( hdr->code )
     {
         case NM_DBLCLK:
 
     // post processing
     switch ( hdr->code )
     {
         case NM_DBLCLK:

-            // we translate NM_DBLCLK into ACTIVATED event, so don't interpret
-            // the return code of this event handler as the return value for
-            // NM_DBLCLK - otherwise, double clicking the item to toggle its
-            // expanded status would never work
-            *result = false;
+            // we translate NM_DBLCLK into ACTIVATED event and if the user
+            // handled the activation of the item we shouldn't proceed with
+            // also using the same double click for toggling the item expanded
+            // state -- but OTOH do let the user to expand/collapse the item by
+            // double clicking on it if the activation is not handled specially
+            *result = processed;

             break;
 
         case NM_RCLICK:
             break;
 
         case NM_RCLICK:


@@ -2925,11 +3716,13 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
             {
                 // normally this is impossible because the m_dragImage is
                 // deleted once the drag operation is over
             {
                 // normally this is impossible because the m_dragImage is
                 // deleted once the drag operation is over

-                wxASSERT_MSG( !m_dragImage, _T("starting to drag once again?") );
+                wxASSERT_MSG( !m_dragImage, wxT("starting to drag once again?") );

 
                 m_dragImage = new wxDragImage(*this, event.m_item);
                 m_dragImage->BeginDrag(wxPoint(0,0), this);
                 m_dragImage->Show();
 
                 m_dragImage = new wxDragImage(*this, event.m_item);
                 m_dragImage->BeginDrag(wxPoint(0,0), this);
                 m_dragImage->Show();

+
+                m_dragStarted = true;

             }
 #endif // wxUSE_DRAGIMAGE
             break;
             }
 #endif // wxUSE_DRAGIMAGE
             break;


@@ -3105,40 +3898,76 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 // why do they define INDEXTOSTATEIMAGEMASK but not the inverse?
 #define STATEIMAGEMASKTOINDEX(state) (((state) & TVIS_STATEIMAGEMASK) >> 12)
 
 // why do they define INDEXTOSTATEIMAGEMASK but not the inverse?
 #define STATEIMAGEMASKTOINDEX(state) (((state) & TVIS_STATEIMAGEMASK) >> 12)
 

-void wxTreeCtrl::SetState(const wxTreeItemId& node, int state)
+int wxTreeCtrl::DoGetItemState(const wxTreeItemId& item) const

 {
 {

-    TV_ITEM tvi;
-    tvi.hItem = (HTREEITEM)node.m_pItem;
-    tvi.mask = TVIF_STATE;
-    tvi.stateMask = TVIS_STATEIMAGEMASK;
+    wxCHECK_MSG( item.IsOk(), wxTREE_ITEMSTATE_NONE, wxT("invalid tree item") );

 
 

-    // Select the specified state, or -1 == cycle to the next one.
-    if ( state == -1 )
-    {
-        TreeView_GetItem(GetHwnd(), &tvi);
+    // receive the desired information
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
+    DoGetItem(&tvItem);

 
 

-        state = STATEIMAGEMASKTOINDEX(tvi.state) + 1;
-        if ( state == m_imageListState->GetImageCount() )
-            state = 1;
-    }
+    // state images are one-based
+    return STATEIMAGEMASKTOINDEX(tvItem.state) - 1;
+}
+
+void wxTreeCtrl::DoSetItemState(const wxTreeItemId& item, int state)
+{
+    wxCHECK_RET( item.IsOk(), wxT("invalid tree item") );
+
+    wxTreeViewItem tvItem(item, TVIF_STATE, TVIS_STATEIMAGEMASK);
+
+    // state images are one-based
+    // 0 if no state image display (wxTREE_ITEMSTATE_NONE = -1)
+    tvItem.state = INDEXTOSTATEIMAGEMASK(state + 1);
+
+    DoSetItem(&tvItem);
+}

 
 

-    wxCHECK_RET( state < m_imageListState->GetImageCount(),
-                 _T("wxTreeCtrl::SetState(): item index out of bounds") );
+// ----------------------------------------------------------------------------
+// Update locking.
+// ----------------------------------------------------------------------------

 
 

-    tvi.state = INDEXTOSTATEIMAGEMASK(state);
+// Using WM_SETREDRAW with the native control is a bad idea as it's broken in
+// some Windows versions (see http://support.microsoft.com/kb/130611) and
+// doesn't seem to do anything in other ones (e.g. under Windows 7 the tree
+// control keeps updating its scrollbars while the items are added to it,
+// resulting in horrible flicker when adding even a couple of dozen items).
+// So we resize it to the smallest possible size instead of freezing -- this
+// still flickers, but actually not as badly as it would if we didn't do it.

 
 

-    TreeView_SetItem(GetHwnd(), &tvi);
+void wxTreeCtrl::DoFreeze()
+{
+    if ( IsShown() )
+    {
+        RECT rc;
+        ::GetWindowRect(GetHwnd(), &rc);
+        m_thawnSize = wxRectFromRECT(rc).GetSize();
+
+        ::SetWindowPos(GetHwnd(), 0, 0, 0, 1, 1,
+                       SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | SWP_NOACTIVATE);
+    }

 }
 
 }
 

-int wxTreeCtrl::GetState(const wxTreeItemId& node)
+void wxTreeCtrl::DoThaw()

 {
 {

-    TV_ITEM tvi;
-    tvi.hItem = (HTREEITEM)node.m_pItem;
-    tvi.mask = TVIF_STATE;
-    tvi.stateMask = TVIS_STATEIMAGEMASK;
-    TreeView_GetItem(GetHwnd(), &tvi);
+    if ( IsShown() )
+    {
+        if ( m_thawnSize != wxDefaultSize )
+        {
+            ::SetWindowPos(GetHwnd(), 0, 0, 0, m_thawnSize.x, m_thawnSize.y,
+                           SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
+        }
+    }
+}
+
+// We also need to override DoSetSize() to ensure that m_thawnSize is reset if
+// the window is resized while being frozen -- in this case, we need to avoid
+// resizing it back to its original, pre-freeze, size when it's thawed.
+void wxTreeCtrl::DoSetSize(int x, int y, int width, int height, int sizeFlags)
+{
+    m_thawnSize = wxDefaultSize;

 
 

-    return STATEIMAGEMASKTOINDEX(tvi.state);
+    wxTreeCtrlBase::DoSetSize(x, y, width, height, sizeFlags);

 }
 
 #endif // wxUSE_TREECTRL
 }
 
 #endif // wxUSE_TREECTRL