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

user32: Actually use the menu's background brush.

This commit is contained in:
Huw Davies 2015-01-16 11:10:39 +00:00 committed by Alexandre Julliard
parent 14f7fd4e23
commit 9650f21b2d
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/user32/menu.c
View File

@ -1737,15 +1737,17 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
*/ */
static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu )
{ {
HBRUSH hPrevBrush = 0; HBRUSH hPrevBrush = 0, brush = GetSysColorBrush( COLOR_MENU );
RECT rect; RECT rect;
POPUPMENU *menu = MENU_GetMenu( hmenu );
TRACE("wnd=%p dc=%p menu=%p\n", hwnd, hdc, hmenu); TRACE("wnd=%p dc=%p menu=%p\n", hwnd, hdc, hmenu);
GetClientRect( hwnd, &rect ); GetClientRect( hwnd, &rect );
if((hPrevBrush = SelectObject( hdc, GetSysColorBrush(COLOR_MENU) )) if (menu && menu->hbrBack) brush = menu->hbrBack;
&& (SelectObject( hdc, get_menu_font(FALSE)))) if ((hPrevBrush = SelectObject( hdc, brush ))
&& SelectObject( hdc, get_menu_font(FALSE) ))
{ {
HPEN hPrevPen; HPEN hPrevPen;
@ -1754,7 +1756,6 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu )
hPrevPen = SelectObject( hdc, GetStockObject( NULL_PEN ) ); hPrevPen = SelectObject( hdc, GetStockObject( NULL_PEN ) );
if( hPrevPen ) if( hPrevPen )
{ {
POPUPMENU *menu;
BOOL flat_menu = FALSE; BOOL flat_menu = FALSE;
SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0); SystemParametersInfoW (SPI_GETFLATMENU, 0, &flat_menu, 0);
@ -1763,7 +1764,7 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu )
else else
DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT); DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT);
if( (menu = MENU_GetMenu( hmenu ))) if (menu)
{ {
TRACE("hmenu %p Style %08x\n", hmenu, menu->dwStyle); TRACE("hmenu %p Style %08x\n", hmenu, menu->dwStyle);
/* draw menu items */ /* draw menu items */