From b8ec69e863650371f4a69d43dfc4475e739c27e5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 22 Mar 2007 02:28:06 +0000 Subject: [PATCH] use correct background colour for the box label when foreground colour is set (remaining part of patch 1683573) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45008 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/statbox.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/msw/statbox.cpp b/src/msw/statbox.cpp index ffb1b61f2d..692e8a10ca 100644 --- a/src/msw/statbox.cpp +++ b/src/msw/statbox.cpp @@ -483,7 +483,18 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& rc) dimensions.right += 2; dimensions.bottom += 2; - PaintBackground(dc, dimensions); + if ( UseBgCol() ) + { + // our own background colour should be used for the background of + // the label: this is consistent with the behaviour under pre-XP + // systems (i.e. without visual themes) and generally makes sense + wxBrush brush = wxBrush(GetBackgroundColour()); + ::FillRect(GetHdcOf(dc), &dimensions, GetHbrushOf(brush)); + } + else // paint parent background + { + PaintBackground(dc, dimensions); + } // now draw the text if ( !rtl ) -- 2.45.2