mirror of
https://github.com/reactos/reactos.git
synced 2024-07-12 23:55:07 +00:00
bugfix: focus handling in startmenu
svn path=/trunk/; revision=5760
This commit is contained in:
parent
e570fadda7
commit
f45db7ba7a
|
@ -177,6 +177,9 @@ LRESULT StartMenu::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
|
||||||
CloseStartMenu();
|
CloseStartMenu();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case WM_SETFOCUS:
|
||||||
|
break; // don't post WM_CANCELMODE in Window::WndProc when focusing the startmenu
|
||||||
|
|
||||||
case PM_STARTENTRY_FOCUSED: {
|
case PM_STARTENTRY_FOCUSED: {
|
||||||
BOOL hasSubmenu = wparam;
|
BOOL hasSubmenu = wparam;
|
||||||
HWND hctrl = (HWND)lparam;
|
HWND hctrl = (HWND)lparam;
|
||||||
|
@ -459,13 +462,13 @@ LRESULT StartMenuButton::WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
|
||||||
|
|
||||||
case WM_SETFOCUS:
|
case WM_SETFOCUS:
|
||||||
PostParent(PM_STARTENTRY_FOCUSED, _hasSubmenu, (LPARAM)_hwnd);
|
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:
|
case WM_CANCELMODE:
|
||||||
// route WM_CANCELMODE to the startmenu window
|
// route WM_CANCELMODE to the startmenu window
|
||||||
return SendParent(nmsg, wparam, lparam);
|
return SendParent(nmsg, wparam, lparam);
|
||||||
|
|
||||||
default: def:
|
default:
|
||||||
return super::WndProc(nmsg, wparam, lparam);
|
return super::WndProc(nmsg, wparam, lparam);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue