static control: Background of enhanced metafiles.

- Always paint the background of static controls displaying enhanced metafiles. - Also paint the background if there's no metafile to display.

static control: Background of enhanced metafiles.
910f4bb5 · Michael Kaufmann · Alexandre Julliard · 7effdb0b · 910f4bb5
Commit 910f4bb5 authored Jan 17, 2006 by Michael Kaufmann Committed by Alexandre Julliard Jan 17, 2006
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 8 deletions

static.c dlls/user/static.c +9 -8

No files found.
--- a/dlls/user/static.c
+++ b/dlls/user/static.c
@@ -708,17 +708,18 @@ static void STATIC_PaintBitmapfn(HWND hwnd, HDC hdc, DWORD style )
 static void STATIC_PaintEnhMetafn(HWND hwnd, HDC hdc, DWORD style )
 {
    HENHMETAFILE hEnhMetaFile;
+    RECT rc;
+    HBRUSH hbrush;
    
-    /* message is still sent, even if the returned brush is not used */
-    SendMessageW( GetParent(hwnd), WM_CTLCOLORSTATIC,
-                                   (WPARAM)hdc, (LPARAM)hwnd );
-
+    GetClientRect(hwnd, &rc);
+    hbrush = STATIC_SendWmCtlColorStatic(hwnd, hdc);
+    FillRect(hdc, &rc, hbrush);
    if ((hEnhMetaFile = (HENHMETAFILE)GetWindowLongPtrW( hwnd, HICON_GWL_OFFSET )))
    {
-        RECT clientRect;
-        if(GetObjectType(hEnhMetaFile) != OBJ_ENHMETAFILE) return;
-        GetClientRect(hwnd, &clientRect);
-        PlayEnhMetaFile(hdc, hEnhMetaFile, &clientRect);
+        /* The control's current font is not selected into the
+           device context! */
+        if (GetObjectType(hEnhMetaFile) == OBJ_ENHMETAFILE)
+            PlayEnhMetaFile(hdc, hEnhMetaFile, &rc);
    }
 }