When a popupmenu is currently active on the screen, it shouldn't

remove mouse click messages that don't belong to it from the queue.

When a popupmenu is currently active on the screen, it shouldn't
4a0a7df6 · Karl Lessard · Alexandre Julliard · 7cc0e274 · 4a0a7df6
Commit 4a0a7df6 authored Nov 07, 1999 by Karl Lessard Committed by Alexandre Julliard Nov 07, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

menu.c controls/menu.c +4 -1

No files found.
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -2636,7 +2636,10 @@ static INT MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
 		    /* fall through */
 		case WM_LBUTTONDBLCLK:
 		case WM_LBUTTONDOWN:
-		    fRemove = fEndMenu = !MENU_ButtonDown( &mt, hmenu, wFlags );
+		    /* If the message belongs to the menu, removes it from the queue */
+		    /* Else, end menu tracking */
+		    fRemove = MENU_ButtonDown( &mt, hmenu, wFlags );
+		    fEndMenu = !fRemove;
 		    break;
 		
 		case WM_RBUTTONUP: