Dmitry Timoshkov : user32: Paint button focus in the ODA_SELECT case too.
Alexandre Julliard
julliard at winehq.org
Tue May 18 12:33:00 CDT 2010
Module: wine
Branch: master
Commit: cc870dc484c5b9f61db35ac15afae0873c2afc26
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc870dc484c5b9f61db35ac15afae0873c2afc26
Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date: Tue May 18 14:29:23 2010 +0900
user32: Paint button focus in the ODA_SELECT case too.
---
dlls/user32/button.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/dlls/user32/button.c b/dlls/user32/button.c
index 8066e9e..54d54dc 100644
--- a/dlls/user32/button.c
+++ b/dlls/user32/button.c
@@ -833,8 +833,7 @@ static void PB_Paint( HWND hwnd, HDC hDC, UINT action )
SetTextColor( hDC, oldTxtColor );
draw_focus:
- if ((action == ODA_FOCUS) ||
- ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS)))
+ if (action == ODA_FOCUS || (state & BUTTON_HASFOCUS))
{
InflateRect( &rc, -2, -2 );
DrawFocusRect( hDC, &rc );
@@ -963,8 +962,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action )
BUTTON_DrawLabel(hwnd, hDC, dtFlags, &rtext);
/* ... and focus */
- if ((action == ODA_FOCUS) ||
- ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS)))
+ if (action == ODA_FOCUS || (state & BUTTON_HASFOCUS))
{
rtext.left--;
rtext.right++;
@@ -1072,8 +1070,7 @@ static void UB_Paint( HWND hwnd, HDC hDC, UINT action )
(WPARAM)hDC, (LPARAM)hwnd);
FillRect( hDC, &rc, hBrush );
- if ((action == ODA_FOCUS) ||
- ((action == ODA_DRAWENTIRE) && (state & BUTTON_HASFOCUS)))
+ if (action == ODA_FOCUS || (state & BUTTON_HASFOCUS))
DrawFocusRect( hDC, &rc );
switch (action)
More information about the wine-cvs
mailing list