Skip to content

Commit fb0fd2b

Browse files
committed
[0.4.9] cherry-pick [COMCTL32] Simplify some ifdefs CORE-14649
Addendum to 16d6c9b 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. (cherry picked from commit 1c151c9)
1 parent 09c64b5 commit fb0fd2b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

dll/win32/comctl32/button.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,7 +1177,7 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc)
11771177
UINT dtStyle = BUTTON_BStoDT( style, ex_style );
11781178
RECT r = *rc;
11791179
INT n;
1180-
#if !defined(_USER32_) && defined(__REACTOS__)
1180+
#ifdef __REACTOS__
11811181
BOOL bHasIml = BUTTON_DrawIml(hdc, &infoPtr->imlData, &r, TRUE, 0);
11821182
#endif
11831183

@@ -1229,7 +1229,7 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc)
12291229

12301230
default:
12311231
empty_rect:
1232-
#if !defined(_USER32_) && defined(__REACTOS__)
1232+
#ifdef __REACTOS__
12331233
if (bHasIml)
12341234
break;
12351235
#endif
@@ -1238,7 +1238,7 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc)
12381238
return (UINT)-1;
12391239
}
12401240

1241-
#if !defined(_USER32_) && defined(__REACTOS__)
1241+
#ifdef __REACTOS__
12421242
if (bHasIml)
12431243
{
12441244
if (infoPtr->imlData.uAlign == BUTTON_IMAGELIST_ALIGN_LEFT)
@@ -1322,7 +1322,7 @@ static void BUTTON_DrawLabel(const BUTTON_INFO *infoPtr, HDC hdc, UINT dtFlags,
13221322
* I don't have Win31 on hand to verify that, so I leave it as is.
13231323
*/
13241324

1325-
#if !defined(_USER32_) && defined(__REACTOS__)
1325+
#ifdef __REACTOS__
13261326
RECT rcText = *rc;
13271327
BUTTON_DrawIml(hdc, &infoPtr->imlData, &rcText, FALSE, 0);
13281328
#endif

0 commit comments

Comments
 (0)