From f45db7ba7aef153ae53d370d9d3d312f4de459ab Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Fri, 22 Aug 2003 16:59:19 +0000 Subject: [PATCH] bugfix: focus handling in startmenu svn path=/trunk/; revision=5760 --- reactos/subsys/system/explorer/taskbar/startmenu.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/reactos/subsys/system/explorer/taskbar/startmenu.cpp b/reactos/subsys/system/explorer/taskbar/startmenu.cpp index 7e46ea48096..41e0f531b03 100644 --- a/reactos/subsys/system/explorer/taskbar/startmenu.cpp +++ b/reactos/subsys/system/explorer/taskbar/startmenu.cpp @@ -177,6 +177,9 @@ LRESULT StartMenu::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) CloseStartMenu(); break; + case WM_SETFOCUS: + break; // don't post WM_CANCELMODE in Window::WndProc when focusing the startmenu + case PM_STARTENTRY_FOCUSED: { BOOL hasSubmenu = wparam; HWND hctrl = (HWND)lparam; @@ -459,13 +462,13 @@ LRESULT StartMenuButton::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam) case WM_SETFOCUS: PostParent(PM_STARTENTRY_FOCUSED, _hasSubmenu, (LPARAM)_hwnd); - goto def; + return CallWindowProc(_orgWndProc, _hwnd, nmsg, wparam, lparam); // don't post WM_CANCELMODE in Window::WndProc when focusing the startmenu case WM_CANCELMODE: // route WM_CANCELMODE to the startmenu window return SendParent(nmsg, wparam, lparam); - default: def: + default: return super::WndProc(nmsg, wparam, lparam); }