mirror of
https://github.com/reactos/reactos.git
synced 2024-10-05 00:43:21 +00:00
[NtUser]
- Patch by Alex Henrie : Tell MENU_SuspendPopup which message to remove. svn path=/trunk/; revision=75380
This commit is contained in:
parent
ab58eda781
commit
f6da80a67e
|
@ -3729,7 +3729,7 @@ static BOOL FASTCALL MENU_KeyEscape(MTRACKER *pmt, UINT Flags)
|
|||
*
|
||||
* Handle a VK_LEFT key event in a menu.
|
||||
*/
|
||||
static void FASTCALL MENU_KeyLeft(MTRACKER* pmt, UINT Flags)
|
||||
static void FASTCALL MENU_KeyLeft(MTRACKER* pmt, UINT Flags, UINT msg)
|
||||
{
|
||||
PMENU MenuTmp, MenuPrev;
|
||||
UINT PrevCol;
|
||||
|
@ -3765,7 +3765,7 @@ static void FASTCALL MENU_KeyLeft(MTRACKER* pmt, UINT Flags)
|
|||
/* A sublevel menu was displayed - display the next one
|
||||
* unless there is another displacement coming up */
|
||||
|
||||
if (!MENU_SuspendPopup(pmt, WM_KEYDOWN))
|
||||
if (!MENU_SuspendPopup(pmt, msg))
|
||||
pmt->CurrentMenu = MENU_ShowSubPopup(pmt->OwnerWnd, pmt->TopMenu,
|
||||
TRUE, Flags);
|
||||
}
|
||||
|
@ -3777,7 +3777,7 @@ static void FASTCALL MENU_KeyLeft(MTRACKER* pmt, UINT Flags)
|
|||
*
|
||||
* Handle a VK_RIGHT key event in a menu.
|
||||
*/
|
||||
static void FASTCALL MENU_KeyRight(MTRACKER *pmt, UINT Flags)
|
||||
static void FASTCALL MENU_KeyRight(MTRACKER *pmt, UINT Flags, UINT msg)
|
||||
{
|
||||
PMENU menutmp;
|
||||
UINT NextCol;
|
||||
|
@ -3822,7 +3822,7 @@ static void FASTCALL MENU_KeyRight(MTRACKER *pmt, UINT Flags)
|
|||
|
||||
if ( menutmp || pmt->TrackFlags & TF_SUSPENDPOPUP )
|
||||
{
|
||||
if ( !MENU_SuspendPopup(pmt, WM_KEYDOWN) )
|
||||
if ( !MENU_SuspendPopup(pmt, msg) )
|
||||
pmt->CurrentMenu = MENU_ShowSubPopup(pmt->OwnerWnd, pmt->TopMenu, TRUE, Flags);
|
||||
}
|
||||
}
|
||||
|
@ -4038,11 +4038,11 @@ static INT FASTCALL MENU_TrackMenu(PMENU pmenu, UINT wFlags, INT x, INT y,
|
|||
break;
|
||||
|
||||
case VK_LEFT:
|
||||
MENU_KeyLeft( &mt, wFlags );
|
||||
MENU_KeyLeft( &mt, wFlags, msg.message );
|
||||
break;
|
||||
|
||||
case VK_RIGHT:
|
||||
MENU_KeyRight( &mt, wFlags );
|
||||
MENU_KeyRight( &mt, wFlags, msg.message );
|
||||
break;
|
||||
|
||||
case VK_ESCAPE:
|
||||
|
|
Loading…
Reference in a new issue