comctl32: Themed buttons should not draw in System if font unset.

129862f3 · Mark Harmstone · Alexandre Julliard · 6a8da85c · 129862f3
Commit 129862f3 authored Feb 17, 2015 by Mark Harmstone Committed by Alexandre Julliard Feb 18, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

theme_button.c dlls/comctl32/theme_button.c +6 -2

No files found.
--- a/dlls/comctl32/theme_button.c
+++ b/dlls/comctl32/theme_button.c
@@ -181,8 +181,10 @@ static void CB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN
            hPrevFont = SelectObject(hDC, font);
            created_font = TRUE;
        }
-    } else
+    } else {
        font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0);
+        hPrevFont = SelectObject(hDC, font);
+    }

    GetClientRect(hwnd, &bgRect);
    GetThemeBackgroundContentRect(theme, hDC, part, state, &bgRect, &textRect);
@@ -243,8 +245,10 @@ static void GB_draw(HTHEME theme, HWND hwnd, HDC hDC, ButtonState drawState, UIN
            hPrevFont = SelectObject(hDC, font);
            created_font = TRUE;
        }
-    } else
+    } else {
        font = (HFONT)SendMessageW(hwnd, WM_GETFONT, 0, 0);
+        hPrevFont = SelectObject(hDC, font);
+    }

    GetClientRect(hwnd, &bgRect);
    textRect = bgRect;