From 6ed16512ddcd12ce46157ae32ecd96240ed3737e Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 16 Dec 2004 01:50:34 +0000 Subject: [PATCH] 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 --- src/msw/control.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/msw/control.cpp b/src/msw/control.cpp index fe571c7536..d32372b29f 100644 --- 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() ) { -- 2.50.0