Disabled catching of mouse move events when not over menu.

Changed MENU_SelectItem allow EndMenu to deselect the selected menu.
This commit is contained in:
Rizsanyi Zsolt 2002-05-09 01:14:35 +00:00 committed by Alexandre Julliard
parent 32459912dc
commit 0026d78ed8
1 changed files with 3 additions and 2 deletions

View File

@ -1665,6 +1665,7 @@ static void MENU_SelectItem( HWND hwndOwner, HMENU hmenu, UINT wIndex,
if (lppop->FocusedItem == wIndex) return; if (lppop->FocusedItem == wIndex) return;
if (lppop->wFlags & MF_POPUP) hdc = GetDC( lppop->hWnd ); if (lppop->wFlags & MF_POPUP) hdc = GetDC( lppop->hWnd );
else hdc = GetDCEx( lppop->hWnd, 0, DCX_CACHE | DCX_WINDOW); else hdc = GetDCEx( lppop->hWnd, 0, DCX_CACHE | DCX_WINDOW);
if (!top_popup) top_popup = lppop->hWnd;
SelectObject( hdc, hMenuFont); SelectObject( hdc, hMenuFont);
@ -2788,9 +2789,9 @@ static INT MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y,
/* In win95 winelook, the selected menu item must be changed every time the /* In win95 winelook, the selected menu item must be changed every time the
mouse moves. In Win31 winelook, the mouse button has to be held down */ mouse moves. In Win31 winelook, the mouse button has to be held down */
if ( (TWEAK_WineLook > WIN31_LOOK) || if ( hmenu && ((TWEAK_WineLook > WIN31_LOOK) ||
( (msg.wParam & MK_LBUTTON) || ( (msg.wParam & MK_LBUTTON) ||
((wFlags & TPM_RIGHTBUTTON) && (msg.wParam & MK_RBUTTON))) ) ((wFlags & TPM_RIGHTBUTTON) && (msg.wParam & MK_RBUTTON)))) )
fEndMenu |= !MENU_MouseMove( &mt, hmenu, wFlags ); fEndMenu |= !MENU_MouseMove( &mt, hmenu, wFlags );