Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-04 21:38:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[COMCTL32] Simplify some ifdefs CORE-14649

Browse source 
Addendum to 16d6c9b5e0
Giannis suggested and Thomas explained:

Before the Wine sync, comctl32/button.c was based on ROS's
user32/button.c, so _USER32_ would highlight changes between
user32 (originally based on Wine) and comctl32. Now our
comctl32/button.c is based on Wine's comctl32/button.c, so
__REACTOS__ is enough.
This commit is contained in:
Joachim Henze 2018-06-03 14:27:34 +02:00
parent a165999067
commit 1c151c9977
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dll/win32/comctl32/button.c
View file

@ -1177,7 +1177,7 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc)
UINT dtStyle = BUTTON_BStoDT( style, ex_style ); UINT dtStyle = BUTTON_BStoDT( style, ex_style );
RECT r = *rc; RECT r = *rc;
INT n; INT n;
#if !defined(_USER32_) && defined(__REACTOS__) #ifdef __REACTOS__
BOOL bHasIml = BUTTON_DrawIml(hdc, &infoPtr->imlData, &r, TRUE, 0); BOOL bHasIml = BUTTON_DrawIml(hdc, &infoPtr->imlData, &r, TRUE, 0);
#endif #endif
@ -1229,7 +1229,7 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc)
default: default:
empty_rect: empty_rect:
#if !defined(_USER32_) && defined(__REACTOS__) #ifdef __REACTOS__
if (bHasIml) if (bHasIml)
break; break;
#endif #endif
@ -1238,7 +1238,7 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc)
return (UINT)-1; return (UINT)-1;
} }
#if !defined(_USER32_) && defined(__REACTOS__) #ifdef __REACTOS__
if (bHasIml) if (bHasIml)
{ {
if (infoPtr->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_LEFT) if (infoPtr->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_LEFT)
@ -1322,7 +1322,7 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags,
* I don't have Win31 on hand to verify that, so I leave it as is. * I don't have Win31 on hand to verify that, so I leave it as is.
*/ */
#if !defined(_USER32_) && defined(__REACTOS__) #ifdef __REACTOS__
RECT rcText = *rc; RECT rcText = *rc;
BUTTON_DrawIml(hdc, &infoPtr->imlData, &rcText, FALSE, 0); BUTTON_DrawIml(hdc, &infoPtr->imlData, &rcText, FALSE, 0);
#endif #endif