Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32SS]

Browse source 
- Patch by Huw Davies : Restore the dc's colours after sending WM_DRAWITEM.
- Wine sync port.

svn path=/trunk/; revision=69932
This commit is contained in:
James Tabor 2015-11-18 21:25:33 +00:00
parent 90c9e4d30c
commit c8e6ca880d
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
reactos/win32ss/user/ntuser/menu.c
View file

@ -2266,6 +2266,7 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND WndOwner, HDC
** the menu owner has finished drawing.
*/
DRAWITEMSTRUCT dis;
COLORREF old_bk, old_text;
dis.CtlType = ODT_MENU;
dis.CtlID = 0;
@ -2289,7 +2290,11 @@ static void FASTCALL MENU_DrawMenuItem(PWND Wnd, PMENU Menu, PWND WndOwner, HDC
dis.hDC, dis.rcItem.left, dis.rcItem.top, dis.rcItem.right,
dis.rcItem.bottom);
TRACE("Ownerdraw: Width %d Height %d\n", dis.rcItem.right-dis.rcItem.left, dis.rcItem.bottom-dis.rcItem.top);
old_bk = GreGetBkColor(hdc);
old_text = GreGetTextColor(hdc);
co_IntSendMessage(UserHMGetHandle(WndOwner), WM_DRAWITEM, 0, (LPARAM) &dis);
IntGdiSetBkColor(hdc, old_bk);
IntGdiSetTextColor(hdc, old_text);
/* Draw the popup-menu arrow */
if (!menuBar && lpitem->spSubMenu)
{