comctl32/button: Do not restore checkbox font after themed painting.

Fix button tests failures when theming is on. Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32/button: Do not restore checkbox font after themed painting.
687d9d0b · Zhiyi Zhang · Alexandre Julliard · 8b30c00a · 687d9d0b
Commit 687d9d0b authored Oct 01, 2021 by Zhiyi Zhang Committed by Alexandre Julliard Oct 01, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

button.c dlls/comctl32/button.c +1 -2

No files found.
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
@@ -2744,8 +2744,7 @@ static void CB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
            created_font = TRUE;
        }
    } else {
-        font = (HFONT)SendMessageW(infoPtr->hwnd, WM_GETFONT, 0, 0);
-        hPrevFont = SelectObject(hDC, font);
+        if (infoPtr->font) SelectObject(hDC, infoPtr->font);
    }

    if (FAILED(GetThemePartSize(theme, hDC, part, state, NULL, TS_DRAW, &sz)))