repaired setting foreground colours for the standard controls

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2004-12-16 01:50:34 +00:00
parent 4293f84787
commit 6ed16512dd
1 changed files with 4 additions and 0 deletions
--- a/src/msw/control.cpp
+++ b/src/msw/control.cpp
@@ -335,7 +335,11 @@ WXHBRUSH wxControl::MSWControlColorSolid(WXHDC pDC, wxColour colBg)
 {
    HDC hdc = (HDC)pDC;
    if ( m_hasFgCol )
+    {
        ::SetTextColor(hdc, wxColourToRGB(GetForegroundColour()));
+        if ( !colBg.Ok() )
+            colBg = GetBackgroundColour();
+    }

    if ( colBg.Ok() )
    {