From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 7 Jan 2005 16:59:48 +0000 (+0000)
Subject: use HasTransparentBackground() to correctly draw the background of static text/box... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/accbb1e75890c115105210e9cb838909aa0e8114

use HasTransparentBackground() to correctly draw the background of static text/box on a window with non-inheritable (== own) background set


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

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index a3a82351a4..9f2ee69c58 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -4138,9 +4138,17 @@ WXHBRUSH wxWindowMSW::MSWGetSolidBgBrushForChild(wxWindow *child)
 
 wxColour wxWindowMSW::MSWGetBgColourForChild(wxWindow *child)
 {
-    return m_inheritBgCol || (m_hasBgCol && child == this)
-                ? GetBackgroundColour()
-                : wxNullColour;
+    if ( m_hasBgCol )
+    {
+        if ( m_inheritBgCol ||
+                child == this ||
+                    child->HasTransparentBackground() )
+        {
+            return GetBackgroundColour();
+        }
+    }
+
+    return wxNullColour;
 }
 
 WXHBRUSH wxWindowMSW::MSWGetBgBrushForSelf(wxWindow *parent, WXHDC hDC)