X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f8130d6b3012265895fd69ce394c443c045b709..3ecd9f92e4e251564ed0c70f765493b5c9987541:/src/msw/statbox.cpp

diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp
index 07b6e67c9f..b426f923e4 100644
--- a/src/msw/statbox.cpp
+++ b/src/msw/statbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/statbox.cpp
+// Name:        src/msw/statbox.cpp
 // Purpose:     wxStaticBox
 // Author:      Julian Smart
 // Modified by:
@@ -26,17 +26,17 @@
 
 #if wxUSE_STATBOX
 
+#include "wx/statbox.h"
+
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/dcclient.h"
+    #include "wx/dcmemory.h"
+    #include "wx/image.h"
 #endif
 
-#include "wx/statbox.h"
 #include "wx/notebook.h"
 #include "wx/sysopt.h"
-#include "wx/image.h"
-#include "wx/dcmemory.h"
-#include "wx/sysopt.h"
 
 #include "wx/msw/uxtheme.h"
 #include "wx/msw/private.h"
@@ -160,7 +160,7 @@ wxSize wxStaticBox::DoGetBestSize() const
     wxGetCharSize(GetHWND(), &cx, &cy, GetFont());
 
     int wBox;
-    GetTextExtent(wxStripMenuCodes(wxGetWindowText(m_hWnd)), &wBox, &cy);
+    GetTextExtent(GetLabelText(wxGetWindowText(m_hWnd)), &wBox, &cy);
 
     wBox += 3*cx;
     int hBox = EDIT_HEIGHT_FROM_CHAR_HEIGHT(cy);
@@ -372,24 +372,61 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& WXUNUSED(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 ( m_hasFgCol && wxUxThemeEngine::GetIfActive() )
+    if ( wxUxThemeEngine::GetIfActive() )
     {
         // draw over the text in default colour in our colour
         dc.SetFont(GetFont());
 
         HDC hdc = GetHdcOf(dc);
-        ::SetTextColor(hdc, GetForegroundColour().GetPixel());
+        if ( m_hasFgCol )
+        {
+            ::SetTextColor(hdc, GetForegroundColour().GetPixel());
+        }
+        else
+        {
+            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
+            {
+                // can't open the theme - default to blue
+                ::SetTextColor(hdc, 0x00D54600);
+            }
+        }
 
         // FIXME: value of x is hardcoded as this is what it is on my system,
         //        no idea if it's true everywhere
-        const int y = dc.GetCharHeight();
-        const int x = 9;
-
         // TODO: RTL?
-        RECT rc = { x, 0, GetSize().x - x, y };
-
+        const int x = 9;
+        const int y = dc.GetCharHeight();
         const wxString label = GetLabel();
-        ::DrawText(hdc, label, label.length(), &rc, DT_SINGLELINE | DT_VCENTER);
+
+        // first we need to correctly paint the background of the label
+        // as Windows ignores the brush offset when doing it
+        RECT rc = { x, 0, GetSize().x, y };
+        ::DrawText(hdc, label, label.length(), &rc,
+                   DT_SINGLELINE | DT_VCENTER | DT_CALCRECT);
+
+        // need to adjust the rectangle to cover all the label background
+        rc.left -= 2;
+        rc.right += 2;
+        rc.bottom += 2;
+        PaintBackground(dc, rc);
+
+        // now draw the text
+        RECT rc2 = { x, 0, GetSize().x, y };
+        ::DrawText(hdc, label, label.length(), &rc2,
+                   DT_SINGLELINE | DT_VCENTER);
     }
 }
 
@@ -447,4 +484,3 @@ void wxStaticBox::OnPaint(wxPaintEvent& WXUNUSED(event))
 #endif // !__WXWINCE__
 
 #endif // wxUSE_STATBOX
-