From 9f22b00e34c8e8bc1913eaf7785a80bac8373338 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 6 Jul 2005 11:25:23 +0000 Subject: [PATCH] don't generate ACTIVATE events for Alt-Space key press git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/treectrl.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index 87cd1df038..b04f9d9cc7 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -2817,8 +2817,8 @@ 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 - WXLPARAM lParam = - (::GetKeyState(VK_MENU) < 0 ? KF_ALTDOWN : 0) << 16; + const bool isAltDown = ::GetKeyState(VK_MENU) < 0; + WXLPARAM lParam = (isAltDown ? KF_ALTDOWN : 0) << 16; WXWPARAM wParam = info->wVKey; @@ -2836,7 +2836,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result) wParam); // a separate event for Space/Return - if ( !wxIsCtrlDown() && !wxIsShiftDown() && + if ( !wxIsCtrlDown() && !wxIsShiftDown() && !isAltDown && ((info->wVKey == VK_SPACE) || (info->wVKey == VK_RETURN)) ) { wxTreeEvent event2(wxEVT_COMMAND_TREE_ITEM_ACTIVATED, -- 2.45.2