ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Restore the dc's colours after sending WM_DRAWITEM. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2015-11-02 10:10:54 +00:00 committed by Alexandre Julliard
parent fcf9ec8080
commit e79684874d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/user32/menu.c
View File

@ -1458,6 +1458,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
** the menu owner has finished drawing. ** the menu owner has finished drawing.
*/ */
DRAWITEMSTRUCT dis; DRAWITEMSTRUCT dis;
COLORREF old_bk, old_text;
dis.CtlType = ODT_MENU; dis.CtlType = ODT_MENU;
dis.CtlID = 0; dis.CtlID = 0;
@ -1475,8 +1476,12 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
"hwndItem=%p, hdc=%p, rcItem=%s\n", hwndOwner, "hwndItem=%p, hdc=%p, rcItem=%s\n", hwndOwner,
dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem, dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem,
dis.hDC, wine_dbgstr_rect( &dis.rcItem)); dis.hDC, wine_dbgstr_rect( &dis.rcItem));
old_bk = GetBkColor( hdc );
old_text = GetTextColor( hdc );
SendMessageW( hwndOwner, WM_DRAWITEM, 0, (LPARAM)&dis ); SendMessageW( hwndOwner, WM_DRAWITEM, 0, (LPARAM)&dis );
/* Draw the popup-menu arrow */ /* Draw the popup-menu arrow */
SetBkColor( hdc, old_bk );
SetTextColor( hdc, old_text );
if (lpitem->fType & MF_POPUP) if (lpitem->fType & MF_POPUP)
draw_popup_arrow( hdc, rect, arrow_bitmap_width, draw_popup_arrow( hdc, rect, arrow_bitmap_width,
arrow_bitmap_height); arrow_bitmap_height);