system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 22:34:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Post a WM_CANCELMODE message to wake up the internal menu handling

Browse source 
code. This fixes the problem of a menu being orphaned when the parent
window disappears, or if the parent loses focus.
This commit is contained in:
Rob Farnum 2000-05-23 23:34:17 +00:00 committed by Alexandre Julliard
parent 410617fe52
commit b200793de4
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
controls/menu.c
View file

@ -2725,6 +2725,19 @@ static INT MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
if (!MSG_InternalGetMessage( QMSG_WIN32A, &msg, msg.hwnd, mt.hOwnerWnd,
MSGF_MENU, PM_NOREMOVE, !enterIdleSent, &enterIdleSent )) break;
/* check if EndMenu() tried to cancel us, by posting this message */
if(msg.message == WM_CANCELMODE)
{
/* we are now out of the loop */
fEndMenu = TRUE;
/* remove the message from the queue */
PeekMessageA( &msg, 0, msg.message, msg.message, PM_REMOVE );
/* break out of internal loop, ala ESCAPE */
break;
}
TranslateMessage( &msg );
mt.pt = msg.pt;
@ -4157,11 +4170,18 @@ BOOL WINAPI DrawMenuBar( HWND hWnd )
*/
void WINAPI EndMenu(void)
{
/*
* FIXME: NOT ENOUGH! This has to cancel menu tracking right away.
*/
/* if we are in the menu code, and it is active */
if (fEndMenu == FALSE && MENU_IsMenuActive())
{
/* terminate the menu handling code */
fEndMenu = TRUE;
fEndMenu = TRUE;
/* needs to be posted to wakeup the internal menu handler */
/* which will now terminate the menu, in the event that */
/* the main window was minimized, or lost focus, so we */
/* don't end up with an orphaned menu */
PostMessageA( pTopPopupWnd->hwndSelf, WM_CANCELMODE, 0, 0);
}
}