linking fix for wxUSE_VALIDATORS==0

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

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 72fa295d374ff94249dfecde6b6c237bf9b43d8d..b408ac740d961ef193b216d71d656e56ac3ea6fe 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -106,6 +106,30 @@ private:
 
 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
 // ----------------------------------------------------------------------------


@@ -407,7 +431,7 @@ public:
                     break;
 
                 default:
                     break;
 
                 default:

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

             }
         }
 
             }
         }
 


@@ -724,7 +748,9 @@ void wxTreeCtrl::Init()
     m_pVirtualRoot = NULL;
     m_dragStarted = false;
     m_focusLost = true;
     m_pVirtualRoot = NULL;
     m_dragStarted = false;
     m_focusLost = true;

+    m_changingSelection = false;

     m_triggerStateImageClick = 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


@@ -841,7 +867,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) )
     {


@@ -1329,6 +1355,11 @@ wxTreeItemId wxTreeCtrl::GetSelection() const
     wxCHECK_MSG( !HasFlag(wxTR_MULTIPLE), wxTreeItemId(),
                  wxT("this only works with single selection controls") );
 
     wxCHECK_MSG( !HasFlag(wxTR_MULTIPLE), wxTreeItemId(),
                  wxT("this only works with single selection controls") );
 

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

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


@@ -1473,7 +1504,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);


@@ -1554,7 +1585,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;


@@ -1595,7 +1626,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);


@@ -1622,10 +1653,13 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
             }
         }
 
             }
         }
 

-        if ( !TreeView_DeleteItem(GetHwnd(), HITEM(item)) )

         {
         {

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

         }
 
         if ( !selected )
         }
 
         if ( !selected )


@@ -1644,8 +1678,8 @@ void wxTreeCtrl::Delete(const wxTreeItemId& item)
             }
             else
             {
             }
             else
             {

-                ::SelectItem(GetHwnd(), HITEM(next), false);
-                TreeView_SelectItem(GetHwnd(), 0);
+                DoUnselectItem(next);
+                ClearFocusedItem();

             }
         }
     }
             }
         }
     }


@@ -1787,7 +1821,7 @@ void wxTreeCtrl::Unselect()
 
         if ( IsTreeEventAllowed(changingEvent) )
         {
 
         if ( IsTreeEventAllowed(changingEvent) )
         {

-            TreeView_SelectItem(GetHwnd(), 0);
+            ClearFocusedItem();

 
             wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                      this, wxTreeItemId());
 
             wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                      this, wxTreeItemId());


@@ -1797,7 +1831,7 @@ void wxTreeCtrl::Unselect()
     }
     else
     {
     }
     else
     {

-        TreeView_SelectItem(GetHwnd(), 0);
+        ClearFocusedItem();

     }
 }
 
     }
 }
 


@@ -1808,7 +1842,7 @@ void wxTreeCtrl::DoUnselectAll()
 
     for ( size_t n = 0; n < count; n++ )
     {
 
     for ( size_t n = 0; n < count; n++ )
     {

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

     }
 
     m_htSelStart.Unset();
     }
 
     m_htSelStart.Unset();


@@ -1827,7 +1861,6 @@ void wxTreeCtrl::UnselectAll()
         if ( IsTreeEventAllowed(changingEvent) )
         {
             DoUnselectAll();
         if ( IsTreeEventAllowed(changingEvent) )
         {
             DoUnselectAll();

-            TreeView_SelectItem(GetHwnd(), 0);

 
             wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this);
             changedEvent.m_itemOld = htFocus;
 
             wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this);
             changedEvent.m_itemOld = htFocus;


@@ -1840,12 +1873,20 @@ void wxTreeCtrl::UnselectAll()
     }
 }
 
     }
 }
 

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

 
 

-    if ( IsSelected(item) == select )
+    if ( select == IsSelected(item) )

     {
     {

+        // nothing to do, the item is already in the requested state

         return;
     }
 
         return;
     }
 


@@ -1856,11 +1897,11 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
         if ( IsTreeEventAllowed(changingEvent) )
         {
             HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());
         if ( IsTreeEventAllowed(changingEvent) )
         {
             HTREEITEM htFocus = (HTREEITEM)TreeView_GetSelection(GetHwnd());

-            ::SelectItem(GetHwnd(), HITEM(item), select);
+            DoSelectItem(item, select);

 
             if ( !htFocus )
             {
 
             if ( !htFocus )
             {

-                ::SetFocus(GetHwnd(), HITEM(item));
+                SetFocusedItem(item);

             }
 
             wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
             }
 
             wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,


@@ -1868,29 +1909,41 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
             (void)HandleTreeEvent(changedEvent);
         }
     }
             (void)HandleTreeEvent(changedEvent);
         }
     }

-    else
+    else // single selection

     {
     {

-        wxASSERT_MSG( select,
-                      _T("SelectItem(false) works only for multiselect") );
+        wxTreeItemId itemOld, itemNew;
+        if ( select )
+        {
+            itemOld = GetSelection();
+            itemNew = item;
+        }
+        else // deselecting the currently selected item
+        {
+            itemOld = item;
+            // leave itemNew invalid
+        }

 
         // in spite of the docs (MSDN Jan 99 edition), we don't seem to receive
         // the notification from the control (i.e. TVN_SELCHANG{ED|ING}), so
         // send them ourselves
 
 
         // in spite of the docs (MSDN Jan 99 edition), we don't seem to receive
         // the notification from the control (i.e. TVN_SELCHANG{ED|ING}), so
         // send them ourselves
 

-        wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, item);
+        wxTreeEvent
+            changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING, this, itemNew);
+        changingEvent.SetOldItem(itemOld);

 
         if ( IsTreeEventAllowed(changingEvent) )
         {
 
         if ( IsTreeEventAllowed(changingEvent) )
         {

-            if ( !TreeView_SelectItem(GetHwnd(), HITEM(item)) )
+            if ( !TreeView_SelectItem(GetHwnd(), HITEM(itemNew)) )

             {
                 wxLogLastError(wxT("TreeView_SelectItem"));
             }
             else // ok
             {
             {
                 wxLogLastError(wxT("TreeView_SelectItem"));
             }
             else // ok
             {

-                ::SetFocus(GetHwnd(), HITEM(item));
+                SetFocusedItem(item);

 
                 wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
 
                 wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,

-                                         this, item);
+                                         this, itemNew);
+                changedEvent.SetOldItem(itemOld);

                 (void)HandleTreeEvent(changedEvent);
             }
         }
                 (void)HandleTreeEvent(changedEvent);
             }
         }


@@ -1900,7 +1953,7 @@ void wxTreeCtrl::SelectItem(const wxTreeItemId& item, bool select)
 
 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));


@@ -2029,6 +2082,37 @@ 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)
+{
+    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
 // ----------------------------------------------------------------------------


@@ -2131,7 +2215,7 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id_)
     return true;
 }
 
     return true;
 }
 

-bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
+bool wxTreeCtrl::MSWHandleSelectionKey(unsigned vkey)

 {
     const bool bCtrl = wxIsCtrlDown();
     const bool bShift = wxIsShiftDown();
 {
     const bool bCtrl = wxIsCtrlDown();
     const bool bShift = wxIsShiftDown();


@@ -2152,7 +2236,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
 
                 if ( IsTreeEventAllowed(changingEvent) )
                 {
 
                 if ( IsTreeEventAllowed(changingEvent) )
                 {

-                    ::ToggleItemSelection(GetHwnd(), htSel);
+                    DoToggleItemSelection(wxTreeItemId(htSel));

 
                     wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                              this, htSel);
 
                     wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                              this, htSel);


@@ -2174,7 +2258,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
                     if ( IsTreeEventAllowed(changingEvent) )
                     {
                         DoUnselectAll();
                     if ( IsTreeEventAllowed(changingEvent) )
                     {
                         DoUnselectAll();

-                        ::SelectItem(GetHwnd(), htSel);
+                        DoSelectItem(wxTreeItemId(htSel));

 
                         wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                  this, htSel);
 
                         wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                  this, htSel);


@@ -2190,10 +2274,9 @@ bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
             if ( !bCtrl && !bShift )
             {
                 wxArrayTreeItemIds selections;
             if ( !bCtrl && !bShift )
             {
                 wxArrayTreeItemIds selections;

-                size_t count = GetSelections(selections);

                 wxTreeItemId next;
 
                 wxTreeItemId next;
 

-                if ( htSel && count > 0 )
+                if ( htSel )

                 {
                     next = vkey == VK_UP
                             ? TreeView_GetPrevVisible(GetHwnd(), htSel)
                 {
                     next = vkey == VK_UP
                             ? TreeView_GetPrevVisible(GetHwnd(), htSel)


@@ -2205,14 +2288,6 @@ bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
 
                     if ( IsHiddenRoot(next) )
                         next = TreeView_GetChild(GetHwnd(), HITEM(next));
 
                     if ( IsHiddenRoot(next) )
                         next = TreeView_GetChild(GetHwnd(), HITEM(next));

-
-                    if ( vkey == VK_DOWN )
-                    {
-                        wxTreeItemId next2 = TreeView_GetNextVisible(
-                                                GetHwnd(), HITEM(next));
-                        if ( next2 )
-                            next = next2;
-                    }

                 }
 
                 if ( !next.IsOk() )
                 }
 
                 if ( !next.IsOk() )


@@ -2227,8 +2302,8 @@ bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
                 if ( IsTreeEventAllowed(changingEvent) )
                 {
                     DoUnselectAll();
                 if ( IsTreeEventAllowed(changingEvent) )
                 {
                     DoUnselectAll();

-                    ::SelectItem(GetHwnd(), HITEM(next));
-                    ::SetFocus(GetHwnd(), HITEM(next));
+                    DoSelectItem(next);
+                    SetFocusedItem(next);

 
                     wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                              this, next);
 
                     wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                              this, next);


@@ -2269,7 +2344,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
                     }
                 }
 
                     }
                 }
 

-                ::SetFocus(GetHwnd(), HITEM(next));
+                SetFocusedItem(next);

             }
             break;
 
             }
             break;
 


@@ -2291,8 +2366,8 @@ bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
                     if ( IsTreeEventAllowed(changingEvent) )
                     {
                         DoUnselectAll();
                     if ( IsTreeEventAllowed(changingEvent) )
                     {
                         DoUnselectAll();

-                        ::SelectItem(GetHwnd(), HITEM(next));
-                        ::SetFocus(GetHwnd(), HITEM(next));
+                        DoSelectItem(next);
+                        SetFocusedItem(next);

 
                         wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                  this, next);
 
                         wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                  this, next);


@@ -2326,8 +2401,8 @@ bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
                 if ( IsTreeEventAllowed(changingEvent) )
                 {
                     DoUnselectAll();
                 if ( IsTreeEventAllowed(changingEvent) )
                 {
                     DoUnselectAll();

-                    ::SelectItem(GetHwnd(), HITEM(next));
-                    ::SetFocus(GetHwnd(), HITEM(next));
+                    DoSelectItem(next);
+                    SetFocusedItem(next);

 
                     wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
                     changedEvent.m_itemOld = htSel;
 
                     wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED, this, next);
                     changedEvent.m_itemOld = htSel;


@@ -2386,7 +2461,7 @@ bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
                             SelectRange(GetHwnd(),
                                         HITEM(m_htSelStart), HITEM(next),
                                         SR_UNSELECT_OTHERS);
                             SelectRange(GetHwnd(),
                                         HITEM(m_htSelStart), HITEM(next),
                                         SR_UNSELECT_OTHERS);

-                            ::SetFocus(GetHwnd(), HITEM(next));
+                            SetFocusedItem(next);

 
                             wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                      this, next);
 
                             wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                      this, next);


@@ -2404,8 +2479,8 @@ bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
                     if ( IsTreeEventAllowed(changingEvent) )
                     {
                         DoUnselectAll();
                     if ( IsTreeEventAllowed(changingEvent) )
                     {
                         DoUnselectAll();

-                        ::SelectItem(GetHwnd(), HITEM(next));
-                        ::SetFocus(GetHwnd(), HITEM(next));
+                        DoSelectItem(next);
+                        SetFocusedItem(next);

 
                         wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                  this, next);
 
                         wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                  this, next);


@@ -2507,8 +2582,8 @@ bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
                 {
                     DoUnselectAll();
                     m_htSelStart.Unset();
                 {
                     DoUnselectAll();
                     m_htSelStart.Unset();

-                    ::SelectItem(GetHwnd(), HITEM(next));
-                    ::SetFocus(GetHwnd(), HITEM(next));
+                    DoSelectItem(next);
+                    SetFocusedItem(next);

 
                     wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                              this, next);
 
                     wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                              this, next);


@@ -2525,6 +2600,40 @@ bool wxTreeCtrl::MSWHandleSelectionKey(WPARAM vkey)
     return true;
 }
 
     return true;
 }
 

+bool wxTreeCtrl::MSWHandleTreeKeyDownEvent(WXWPARAM wParam, WXLPARAM lParam)
+{
+    wxTreeEvent keyEvent(wxEVT_COMMAND_TREE_KEY_DOWN, this);
+
+    int keyCode = wxCharCodeMSWToWX(wParam);
+
+    if ( !keyCode )
+    {
+        // wxCharCodeMSWToWX() returns 0 to indicate that this is a
+        // simple ASCII key
+        keyCode = wParam;
+    }
+
+    keyEvent.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN, keyCode,
+                                       lParam, wParam);
+
+    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_COMMAND_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
 // 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


@@ -2605,14 +2714,21 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                 if ( !isMultiple )
                     break;
 
                 if ( !isMultiple )
                     break;
 

-                processed = true;

                 m_htClickedItem.Unset();
 
                 if ( !(tvht.flags & TVHT_ONITEM) )
                 {
                 m_htClickedItem.Unset();
 
                 if ( !(tvht.flags & TVHT_ONITEM) )
                 {

-                    if ( !HandleMouseEvent(nMsg, x, y, wParam) )
+                    if ( tvht.flags & TVHT_ONITEMBUTTON )

                     {
                     {

-                        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();
+
+                        if ( !HandleMouseEvent(nMsg, x, y, wParam) )

                         {
                             if ( !IsExpanded(htItem) )
                             {
                         {
                             if ( !IsExpanded(htItem) )
                             {


@@ -2625,9 +2741,11 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         }
                     }
 
                         }
                     }
 

+                    m_focusLost = false;

                     break;
                 }
 
                     break;
                 }
 

+                processed = true;

                 SetFocus();
                 m_htClickedItem = (WXHTREEITEM) htItem;
                 m_ptClick = wxPoint(x, y);
                 SetFocus();
                 m_htClickedItem = (WXHTREEITEM) htItem;
                 m_ptClick = wxPoint(x, y);


@@ -2647,9 +2765,9 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                     if ( IsTreeEventAllowed(changingEvent) )
                     {
                         // toggle selected state
                     if ( IsTreeEventAllowed(changingEvent) )
                     {
                         // toggle selected state

-                        ::ToggleItemSelection(GetHwnd(), 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();


@@ -2704,10 +2822,10 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                             }
                             else
                             {
                             }
                             else
                             {

-                                ::SelectItem(GetHwnd(), htItem);
+                                DoSelectItem(wxTreeItemId(htItem));

                             }
 
                             }
 

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

 
                             wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                      this, htItem);
 
                             wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                      this, htItem);


@@ -2738,7 +2856,6 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         // clicked outside of the present selection, otherwise,
                         // perform the deselection on mouse-up, this allows
                         // multiple drag and drop to work.
                         // 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_COMMAND_TREE_SEL_CHANGING,
                         if ( !IsItemSelected(GetHwnd(), htItem))
                         {
                             wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,


@@ -2748,8 +2865,8 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                             if ( IsTreeEventAllowed(changingEvent) )
                             {
                                 DoUnselectAll();
                             if ( IsTreeEventAllowed(changingEvent) )
                             {
                                 DoUnselectAll();

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

 
                                 wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                          this, htItem);
 
                                 wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                          this, htItem);


@@ -2759,7 +2876,8 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         }
                         else
                         {
                         }
                         else
                         {

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

                         }
                     }
                     else // click on a single selected item
                         }
                     }
                     else // click on a single selected item


@@ -2774,11 +2892,14 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                         // since previous click
                         if ( m_focusLost )
                         {
                         // since previous click
                         if ( m_focusLost )
                         {

-                            TreeView_SelectItem(GetHwnd(), 0);
-                            ::SelectItem(GetHwnd(), htItem);
+                            ClearFocusedItem();
+                            DoSelectItem(wxTreeItemId(htItem));
+                            SetFocusedItem(wxTreeItemId(htItem));
+                        }
+                        else
+                        {
+                            processed = false;

                         }
                         }

-
-                        processed = false;

                     }
 
                     // reset on any click without Shift
                     }
 
                     // reset on any click without Shift


@@ -2826,8 +2947,8 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                     if ( IsTreeEventAllowed(changingEvent) )
                     {
                         DoUnselectAll();
                     if ( IsTreeEventAllowed(changingEvent) )
                     {
                         DoUnselectAll();

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

 
                         wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                  this, htItem);
 
                         wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                  this, htItem);


@@ -2906,16 +3027,13 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
             case WM_LBUTTONUP:
                 if ( isMultiple )
                 {
             case WM_LBUTTONUP:
                 if ( isMultiple )
                 {

-                    // deselect other items if multiple items selected
+                    // deselect other items if needed

                     if ( htItem )
                     {
                     if ( htItem )
                     {

-                        wxArrayTreeItemIds selections;
-                        size_t count = GetSelections(selections);
-
-                        if ( count > 1 &&
-                             !(wParam & MK_CONTROL) &&
-                             !(wParam & MK_SHIFT) )
+                        if ( m_mouseUpDeselect )

                         {
                         {

+                            m_mouseUpDeselect = false;
+

                             wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
                                                       this, htItem);
                             changingEvent.m_itemOld = htOldItem;
                             wxTreeEvent changingEvent(wxEVT_COMMAND_TREE_SEL_CHANGING,
                                                       this, htItem);
                             changingEvent.m_itemOld = htOldItem;


@@ -2923,8 +3041,8 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
                             if ( IsTreeEventAllowed(changingEvent) )
                             {
                                 DoUnselectAll();
                             if ( IsTreeEventAllowed(changingEvent) )
                             {
                                 DoUnselectAll();

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

 
                                 wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                          this, htItem);
 
                                 wxTreeEvent changedEvent(wxEVT_COMMAND_TREE_SEL_CHANGED,
                                                          this, htItem);


@@ -3027,39 +3145,37 @@ wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
     }
     else if ( (nMsg == WM_KEYDOWN || nMsg == WM_SYSKEYDOWN) && isMultiple )
     {
     }
     else if ( (nMsg == WM_KEYDOWN || nMsg == WM_SYSKEYDOWN) && isMultiple )
     {

-        wxTreeEvent keyEvent(wxEVT_COMMAND_TREE_KEY_DOWN, this);
-
-        int keyCode = wxCharCodeMSWToWX(wParam);
-
-        if ( !keyCode )
+        // 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 )

         {
         {

-            // wxCharCodeMSWToWX() returns 0 to indicate that this is a
-            // simple ASCII key
-            keyCode = wParam;
-        }
+            case VK_RETURN:
+            case VK_SPACE:
+            case VK_UP:
+            case VK_DOWN:
+            case VK_LEFT:
+            case VK_RIGHT:
+            case VK_HOME:
+            case VK_END:
+            case VK_PRIOR:
+            case VK_NEXT:
+                if ( !MSWHandleTreeKeyDownEvent(wParam, lParam) )
+                {
+                    // use the key to update the selection if it was left
+                    // unprocessed
+                    MSWHandleSelectionKey(wParam);
+                }

 
 

-        keyEvent.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN, keyCode,
-                                           lParam, wParam);
+                // pretend that we did process it in any case as we already
+                // generated an event for it
+                processed = true;

 
 

-        processed = HandleTreeEvent(keyEvent);
-        if ( !processed )
-        {
-            // update the selection if key was left unprocessed
-            processed = MSWHandleSelectionKey(wParam);
+            //default: for all the other keys leave processed as false so that
+            //         the tree control generates a TVN_KEYDOWN for us

         }
 
         }
 

-        // 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_COMMAND_TREE_ITEM_ACTIVATED,
-                                           this, htSel);
-                (void)HandleTreeEvent(activatedEvent);
-            }
-        }

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


@@ -3276,45 +3392,9 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
                 // fabricate the lParam and wParam parameters sufficiently
                 // similar to the ones from a "real" WM_KEYDOWN so that
                 // CreateKeyEvent() works correctly
                 // fabricate the lParam and wParam parameters sufficiently
                 // similar to the ones from a "real" WM_KEYDOWN so that
                 // CreateKeyEvent() works correctly

-                const bool isAltDown = ::GetKeyState(VK_MENU) < 0;
-                WXLPARAM lParam = (isAltDown ? 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;
-                }
-
-                wxTreeEvent keyEvent(wxEVT_COMMAND_TREE_KEY_DOWN, this);
-                keyEvent.m_evtKey = CreateKeyEvent(wxEVT_KEY_DOWN,
-                                                keyCode,
-                                                lParam,
-                                                wParam);
-
-                if ( HandleTreeEvent(keyEvent) )
-                {
-                    return true;
-                }
-
-                wxTreeItemId item = wxTreeItemId(TreeView_GetSelection(GetHwnd()));
-
-                // a separate event for Space/Return
-                if ( !wxIsCtrlDown() && !wxIsShiftDown() && !isAltDown &&
-                     ((info->wVKey == VK_SPACE) || (info->wVKey == VK_RETURN)) &&
-                     item )
-                {
-                    wxTreeEvent activatedEvent(wxEVT_COMMAND_TREE_ITEM_ACTIVATED,
-                                       this, item);
-                    (void)HandleTreeEvent(activatedEvent);
-                }
-
-                return false;
+                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


@@ -3352,7 +3432,7 @@ 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:

-            if ( !HasFlag(wxTR_MULTIPLE) )
+            if ( !HasFlag(wxTR_MULTIPLE) || !m_changingSelection )

             {
                 eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;
             }
             {
                 eventType = wxEVT_COMMAND_TREE_SEL_CHANGED;
             }


@@ -3360,7 +3440,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
         case TVN_SELCHANGINGA:
         case TVN_SELCHANGINGW:
 
         case TVN_SELCHANGINGA:
         case TVN_SELCHANGINGW:

-            if ( !HasFlag(wxTR_MULTIPLE) )
+            if ( !HasFlag(wxTR_MULTIPLE) || !m_changingSelection )

             {
                 if ( eventType == wxEVT_NULL )
                     eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;
             {
                 if ( eventType == wxEVT_NULL )
                     eventType = wxEVT_COMMAND_TREE_SEL_CHANGING;


@@ -3424,7 +3504,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
 
                             if ( !loaded )
                             {
 
                             if ( !loaded )
                             {

-                                wxLoadedDLL dllComCtl32(_T("comctl32.dll"));
+                                wxLoadedDLL dllComCtl32(wxT("comctl32.dll"));

                                 if ( dllComCtl32.IsLoaded() )
                                     wxDL_INIT_FUNC(s_pfn, ImageList_Copy, dllComCtl32);
                             }
                                 if ( dllComCtl32.IsLoaded() )
                                     wxDL_INIT_FUNC(s_pfn, ImageList_Copy, dllComCtl32);
                             }


@@ -3626,7 +3706,7 @@ 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 = new wxDragImage(*this, event.m_item);
                 m_dragImage->BeginDrag(wxPoint(0,0), this);