Skip to content

Commit 66b0a48

Browse files
authored
Revert "[COMCTL32][USER32] Fix radio button regression (reactos#2146)" (reactos#2753)
This reverts commit 2d4d3f5. Reverts reactos#2146. I think reactos#2135 (e329e83) and reactos#2146 (2d4d3f5) are my mistakes. CORE-16552, CORE-16747
1 parent 10e52f6 commit 66b0a48

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

dll/win32/comctl32/button.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,11 +1211,7 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc)
12111211
}
12121212

12131213
if ((hFont = infoPtr->font)) hPrevFont = SelectObject( hdc, hFont );
1214-
#ifdef __REACTOS__
1215-
DrawTextW(hdc, text, -1, &r, ((dtStyle | DT_CALCRECT) & ~(DT_VCENTER | DT_BOTTOM)));
1216-
#else
12171214
DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT);
1218-
#endif
12191215
if (hPrevFont) SelectObject( hdc, hPrevFont );
12201216
heap_free( text );
12211217
#ifdef __REACTOS__

win32ss/user/user32/controls/button.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -773,11 +773,7 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc)
773773
}
774774

775775
if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hdc, hFont );
776-
#ifdef __REACTOS__
777-
DrawTextW(hdc, text, -1, &r, ((dtStyle | DT_CALCRECT) & ~(DT_VCENTER | DT_BOTTOM)));
778-
#else
779776
DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT);
780-
#endif
781777
if (hPrevFont) SelectObject( hdc, hPrevFont );
782778
HeapFree( GetProcessHeap(), 0, text );
783779
#ifdef __REACTOS__

0 commit comments

Comments
 (0)