Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
e7968487
Commit
e7968487
authored
Nov 02, 2015
by
Huw Davies
Committed by
Alexandre Julliard
Nov 02, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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
>
parent
fcf9ec80
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
menu.c
dlls/user32/menu.c
+5
-0
No files found.
dlls/user32/menu.c
View file @
e7968487
...
@@ -1458,6 +1458,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
...
@@ -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,
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment