AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't suppress accelerators that include Enter just because a tree control is focused

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49993 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2007-11-16 13:12:20 +00:00
parent 2301cda008
commit 20bdddadd5
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/msw/treectrl.cpp
View File

@ -1948,7 +1948,11 @@ bool wxTreeCtrl::MSWShouldPreProcessMessage(WXMSG* msg)
{ {
if ( msg->message == WM_KEYDOWN ) if ( msg->message == WM_KEYDOWN )
{ {
if ( msg->wParam == VK_RETURN ) const bool isAltDown = ::GetKeyState(VK_MENU) < 0;
// Only eat VK_RETURN if not being used by the application in conjunction with
// modifiers
if ( msg->wParam == VK_RETURN && !wxIsCtrlDown() && !wxIsShiftDown() && !isAltDown)
{ {
// we need VK_RETURN to generate wxEVT_COMMAND_TREE_ITEM_ACTIVATED // we need VK_RETURN to generate wxEVT_COMMAND_TREE_ITEM_ACTIVATED
return false; return false;
@ -2164,7 +2168,7 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
// fire EVT_RIGHT_DOWN // fire EVT_RIGHT_DOWN
HandleMouseEvent(nMsg, x, y, wParam); HandleMouseEvent(nMsg, x, y, wParam);
// send NM_RCLICK // send NM_RCLICK
NMHDR nmhdr; NMHDR nmhdr;
nmhdr.hwndFrom = GetHwnd(); nmhdr.hwndFrom = GetHwnd();
@ -2174,7 +2178,7 @@ WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lPara
nmhdr.idFrom, (LPARAM)&nmhdr); nmhdr.idFrom, (LPARAM)&nmhdr);
// prevent tree control default processing, as we've // prevent tree control default processing, as we've
// already done everything // already done everything
processed = true; processed = true;
} }
break; break;
@ -2640,7 +2644,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
// Vista's tree control has introduced some problems with our // Vista's tree control has introduced some problems with our
// multi-selection tree. When TreeView_SelectItem() is called, // multi-selection tree. When TreeView_SelectItem() is called,
// the wrong items are deselected. // the wrong items are deselected.
// Fortunately, Vista provides a new notification, TVN_ITEMCHANGING // 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 behavior. The
// following messages will allow only the unlocked item's selection // following messages will allow only the unlocked item's selection
@ -2657,7 +2661,7 @@ bool wxTreeCtrl::MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result)
{ {
// item's state is locked, don't allow the change // item's state is locked, don't allow the change
// returning 1 will disallow the change // returning 1 will disallow the change
*result = 1; *result = 1;
return true; return true;
} }
} }