mirror of
https://github.com/reactos/reactos.git
synced 2024-06-29 01:12:06 +00:00
This reverts commit 66b0a48a75
.
This commit is contained in:
parent
66b0a48a75
commit
413d722628
|
@ -1211,7 +1211,11 @@ static UINT BUTTON_CalcLabelRect(const BUTTON_INFO *infoPtr, HDC hdc, RECT *rc)
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((hFont = infoPtr->font)) hPrevFont = SelectObject( hdc, hFont );
|
if ((hFont = infoPtr->font)) hPrevFont = SelectObject( hdc, hFont );
|
||||||
|
#ifdef __REACTOS__
|
||||||
|
DrawTextW(hdc, text, -1, &r, ((dtStyle | DT_CALCRECT) & ~(DT_VCENTER | DT_BOTTOM)));
|
||||||
|
#else
|
||||||
DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT);
|
DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT);
|
||||||
|
#endif
|
||||||
if (hPrevFont) SelectObject( hdc, hPrevFont );
|
if (hPrevFont) SelectObject( hdc, hPrevFont );
|
||||||
heap_free( text );
|
heap_free( text );
|
||||||
#ifdef __REACTOS__
|
#ifdef __REACTOS__
|
||||||
|
|
|
@ -773,7 +773,11 @@ static UINT BUTTON_CalcLabelRect(HWND hwnd, HDC hdc, RECT *rc)
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hdc, hFont );
|
if ((hFont = get_button_font( hwnd ))) hPrevFont = SelectObject( hdc, hFont );
|
||||||
|
#ifdef __REACTOS__
|
||||||
|
DrawTextW(hdc, text, -1, &r, ((dtStyle | DT_CALCRECT) & ~(DT_VCENTER | DT_BOTTOM)));
|
||||||
|
#else
|
||||||
DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT);
|
DrawTextW(hdc, text, -1, &r, dtStyle | DT_CALCRECT);
|
||||||
|
#endif
|
||||||
if (hPrevFont) SelectObject( hdc, hPrevFont );
|
if (hPrevFont) SelectObject( hdc, hPrevFont );
|
||||||
HeapFree( GetProcessHeap(), 0, text );
|
HeapFree( GetProcessHeap(), 0, text );
|
||||||
#ifdef __REACTOS__
|
#ifdef __REACTOS__
|
||||||
|
|
Loading…
Reference in a new issue