]> git.saurik.com Git - wxWidgets.git/commitdiff
If the parents are nothing but a panel and a frame then
authorRobin Dunn <robin@alldunn.com>
Mon, 14 Mar 2005 17:09:00 +0000 (17:09 +0000)
committerRobin Dunn <robin@alldunn.com>
Mon, 14 Mar 2005 17:09:00 +0000 (17:09 +0000)
MSWGetBgBrushForChild will still return NULL.  Fallback to a solid
background colour in this case.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32820 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/stattext.cpp

index 518a7677fd302eca867ac1419f708a332f5a8119..466fb5484d981a815ee5523f67e20a60a6081e22 100644 (file)
@@ -135,6 +135,14 @@ WXHBRUSH wxStaticText::DoMSWControlColor(WXHDC pDC, wxColour colBg)
     if (!hbr && m_hasFgCol)
     {
         hbr = MSWGetBgBrushForChild(pDC, this);
+        if (!hbr)
+        {
+            HDC hdc = (HDC)pDC;
+            wxColour bg = GetBackgroundColour();
+            ::SetBkColor(hdc, wxColourToRGB(bg));
+            wxBrush *brush = wxTheBrushList->FindOrCreateBrush(bg, wxSOLID);
+            hbr = (WXHBRUSH)brush->GetResourceHandle();
+        }
     }
     return hbr;
 }