Patch [ 1816051 ] MSW DrawEllipticArc inconsistent with other platforms

[wxWidgets.git] / src / msw / statbox.cpp

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 010c6d822c0543364580078fcb4d112c1b88ce63..0d4df55d134be0bcf1fac94128fdca2891fc4bfe 100644 (file)
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -42,6 +42,13 @@
 #include "wx/msw/private.h"
 #include "wx/msw/missing.h"
 
+// the values coincide with those in tmschema.h
+#define BP_GROUPBOX 4
+
+#define GBS_NORMAL 1
+
+#define TMT_FONT 210
+
 // ----------------------------------------------------------------------------
 // wxWin macros
 // ----------------------------------------------------------------------------
@@ -383,55 +390,80 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
     // background mode doesn't change anything: the static box def window proc
     // still draws the label in its own colours, so we need to redraw the text
     // ourselves if we have a non default fg colour
-    if ( wxUxThemeEngine::GetIfActive() )
+    if ( m_hasFgCol && wxUxThemeEngine::GetIfActive() )
     {
         // draw over the text in default colour in our colour
-        dc.SetFont(GetFont());
-
         HDC hdc = GetHdcOf(dc);
-        if ( m_hasFgCol )
+        ::SetTextColor(hdc, GetForegroundColour().GetPixel());
+
+        const bool rtl = wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft;
+        if ( rtl )
+            ::SetTextAlign(hdc, TA_RTLREADING | TA_RIGHT);
+
+        // Get dimensions of the label
+        const wxString label = GetLabel();
+
+        // choose the correct font
+        AutoHFONT font;
+        SelectInHDC selFont;
+        if ( m_hasFont )
         {
-            ::SetTextColor(hdc, GetForegroundColour().GetPixel());
+            selFont.Init(hdc, GetHfontOf(GetFont()));
         }
-        else
+        else // no font set, use the one set by the theme
         {
             wxUxThemeHandle hTheme(this, L"BUTTON");
-            if (hTheme)
-            {
-                COLORREF col;
-                wxUxThemeEngine::Get()->GetThemeColor(
-                                            hTheme,
-                                            4 /* BP_GROUPBOX */,
-                                            1 /* GBS_NORMAL */,
-                                            3803 /* TMT_TEXTCOLOR */,
-                                            &col);
-
-                ::SetTextColor(hdc, col);
-            }
-            else
+            if ( hTheme )
             {
-                // can't open the theme - default to blue
-                ::SetTextColor(hdc, 0x00D54600);
+                // GetThemeFont() expects its parameter to be LOGFONTW and not
+                // LOGFONTA even in ANSI programs and will happily corrupt
+                // memory after the struct end if we pass a LOGFONTA (which is
+                // smaller) to it!
+                LOGFONTW lfw;
+                if ( wxUxThemeEngine::Get()->GetThemeFont
+                                             (
+                                                hTheme,
+                                                hdc,
+                                                BP_GROUPBOX,
+                                                GBS_NORMAL,
+                                                TMT_FONT,
+                                                (LOGFONT *)&lfw
+                                             ) == S_OK )
+                {
+#if wxUSE_UNICODE
+                    // ok, no conversion necessary
+                    const LOGFONT& lf = lfw;
+#else // !wxUSE_UNICODE
+                    // most of the fields are the same in LOGFONTA and LOGFONTW
+                    LOGFONT lf;
+                    memcpy(&lf, &lfw, sizeof(lf));
+
+                    // but the face name must be converted
+                    WideCharToMultiByte(CP_ACP, 0, lfw.lfFaceName, -1,
+                                        lf.lfFaceName, sizeof(lf.lfFaceName),
+                                        NULL, NULL);
+#endif // wxUSE_UNICODE/!wxUSE_UNICODE
+
+                    font.Init(lf);
+                    if ( font )
+                        selFont.Init(hdc, font);
+                }
             }
         }
 
-        // FIXME: value of x is hardcoded as this is what it is on my system,
-        //        no idea if it's true everywhere
-
-        const bool rtl = wxTheApp->GetLayoutDirection() == wxLayout_RightToLeft;
-        if ( rtl )
-            ::SetTextAlign(hdc, TA_RTLREADING | TA_RIGHT);
-
-        // Get dimensions of the label
-        const wxString label = GetLabel();
+        // Get the font extent
         int width, height;
-        dc.GetTextExtent(wxStripMenuCodes(label, wxStrip_Mnemonics), &width, &height);
+        dc.GetTextExtent(wxStripMenuCodes(label, wxStrip_Mnemonics),
+                         &width, &height);
 
         int x;
         int y = height;
 
         // first we need to correctly paint the background of the label
         // as Windows ignores the brush offset when doing it
+        //
+        // FIXME: value of x is hardcoded as this is what it is on my system,
+        //        no idea if it's true everywhere
         RECT dimensions = {0, 0, 0, y};
         if ( !rtl )
         {
@@ -450,19 +482,31 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc)
         dimensions.left -= 2;
         dimensions.right += 2;
         dimensions.bottom += 2;
-        PaintBackground(dc, dimensions);
+
+        if ( UseBgCol() )
+        {
+            // our own background colour should be used for the background of
+            // the label: this is consistent with the behaviour under pre-XP
+            // systems (i.e. without visual themes) and generally makes sense
+            wxBrush brush = wxBrush(GetBackgroundColour());
+            ::FillRect(GetHdcOf(dc), &dimensions, GetHbrushOf(brush));
+        }
+        else // paint parent background
+        {
+            PaintBackground(dc, dimensions);
+        }
 
         // now draw the text
         if ( !rtl )
         {
             RECT rc2 = { x, 0, x + width, y };
-            ::DrawText(hdc, label, label.length(), &rc2,
+            ::DrawText(hdc, label.wx_str(), label.length(), &rc2,
                        DT_SINGLELINE | DT_VCENTER);
         }
         else // RTL
         {
             RECT rc2 = { x, 0, x - width, y };
-            ::DrawText(hdc, label, label.length(), &rc2,
+            ::DrawText(hdc, label.wx_str(), label.length(), &rc2,
                        DT_SINGLELINE | DT_VCENTER | DT_RTLREADING);
         }
     }