From f5e6721b33cad1fd22c835ba73bc235ba6273abf Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Sat, 17 Nov 2007 02:24:50 +0000 Subject: [PATCH] Allow selecting disabled menu items svn path=/trunk/; revision=30515 --- reactos/dll/win32/user32/windows/menu.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/reactos/dll/win32/user32/windows/menu.c b/reactos/dll/win32/user32/windows/menu.c index 72fd981fce2..d66426c7e46 100644 --- a/reactos/dll/win32/user32/windows/menu.c +++ b/reactos/dll/win32/user32/windows/menu.c @@ -2081,8 +2081,7 @@ MenuMoveSelection(HWND WndOwner, PROSMENUINFO MenuInfo, INT Offset) } /* If this is a good candidate; */ if (MenuGetRosMenuItemInfo(MenuInfo->Self, i, &ItemInfo) && - 0 == (ItemInfo.fType & MF_SEPARATOR) && - 0 == (ItemInfo.fState & (MFS_DISABLED | MFS_GRAYED)) ) + 0 == (ItemInfo.fType & MF_SEPARATOR)) { MenuSelectItem(WndOwner, MenuInfo, i, TRUE, NULL); MenuCleanupRosMenuItemInfo(&ItemInfo); @@ -2638,11 +2637,11 @@ MenuMouseMove(MTRACKER *Mt, HMENU PtMenu, UINT Flags) { MenuInitRosMenuItemInfo(&ItemInfo); if (MenuGetRosMenuItemInfo(MenuInfo.Self, Index, &ItemInfo) && - !(ItemInfo.fType & MF_SEPARATOR) && - !(ItemInfo.fState & (MFS_DISABLED | MFS_GRAYED)) ) + !(ItemInfo.fType & MF_SEPARATOR)) { MenuSwitchTracking(Mt, &MenuInfo, Index); - Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &MenuInfo, FALSE, Flags); + if (!(ItemInfo.fState & (MFS_DISABLED | MFS_GRAYED))) + Mt->CurrentMenu = MenuShowSubPopup(Mt->OwnerWnd, &MenuInfo, FALSE, Flags); } MenuCleanupRosMenuItemInfo(&ItemInfo); }