]> git.saurik.com Git - wxWidgets.git/commitdiff
Fix assert when editing an item in multi-selection wxTreeCtrl.
authorVadim Zeitlin <vadim@wxwidgets.org>
Sun, 4 Mar 2012 00:29:21 +0000 (00:29 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Sun, 4 Mar 2012 00:29:21 +0000 (00:29 +0000)
Don't use GetSelection() in wxTreeCtrl EVT_CHAR_HOOK handler as it can only be
used with single selection controls and results in an assert when used with
multi-selection ones. Simply use GetFocusedItem() instead.

Closes #14062.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70795 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/treebase.cpp

index 4c0965c435c9e9b1ea9a7446efb919002da77b4e..f831b489adf30e4aa3c9d1e2bd49f4ce16ff0ecb 100644 (file)
@@ -363,7 +363,7 @@ void wxTreeCtrlBase::OnCharHook(wxKeyEvent& event)
                 // fall through
 
             case WXK_RETURN:
-                EndEditLabel(GetSelection(), discardChanges);
+                EndEditLabel(GetFocusedItem(), discardChanges);
 
                 // Do not call Skip() below.
                 return;