cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't handle WM_PRINTCLIENT anymore, manually draw the static box label background instead.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40236 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jamie Gadd 2006-07-22 17:20:05 +00:00
parent f2c78bada4
commit 24e35cf87b
2 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/msw/statbox.cpp
View File

@ -372,24 +372,61 @@ void wxStaticBox::PaintForeground(wxDC& dc, const RECT& WXUNUSED(rc))
// background mode doesn't change anything: the static box def window proc // background mode doesn't change anything: the static box def window proc
// still draws the label in its own colours, so we need to redraw the text // still draws the label in its own colours, so we need to redraw the text
// ourselves if we have a non default fg colour // ourselves if we have a non default fg colour
if ( m_hasFgCol && wxUxThemeEngine::GetIfActive() ) if ( wxUxThemeEngine::GetIfActive() )
{ {
// draw over the text in default colour in our colour // draw over the text in default colour in our colour
dc.SetFont(GetFont()); dc.SetFont(GetFont());
HDC hdc = GetHdcOf(dc); HDC hdc = GetHdcOf(dc);
::SetTextColor(hdc, GetForegroundColour().GetPixel()); if ( m_hasFgCol )
{
::SetTextColor(hdc, GetForegroundColour().GetPixel());
}
else
{
wxUxThemeHandle hTheme(this, L"BUTTON");
if (hTheme)
{
COLORREF col;
wxUxThemeEngine::Get()->GetThemeColor(
hTheme,
4 /* BP_GROUPBOX */,
1 /* GBS_NORMAL */,
3803 /* TMT_TEXTCOLOR */,
&col);
::SetTextColor(hdc, col);
}
else
{
// can't open the theme - default to blue
::SetTextColor(hdc, 0x00D54600);
}
}
// FIXME: value of x is hardcoded as this is what it is on my system, // FIXME: value of x is hardcoded as this is what it is on my system,
// no idea if it's true everywhere // no idea if it's true everywhere
const int y = dc.GetCharHeight();
const int x = 9;
// TODO: RTL? // TODO: RTL?
RECT rc = { x, 0, GetSize().x, y }; const int x = 9;
const int y = dc.GetCharHeight();
const wxString label = GetLabel(); const wxString label = GetLabel();
::DrawText(hdc, label, label.length(), &rc, DT_SINGLELINE | DT_VCENTER);
// first we need to correctly paint the background of the label
// as Windows ignores the brush offset when doing it
RECT rc = { x, 0, GetSize().x, y };
::DrawText(hdc, label, label.length(), &rc,
DT_SINGLELINE | DT_VCENTER | DT_CALCRECT);
// need to adjust the rectangle to cover all the label background
rc.left -= 2;
rc.right += 2;
rc.bottom += 2;
PaintBackground(dc, rc);
// now draw the text
RECT rc2 = { x, 0, GetSize().x, y };
::DrawText(hdc, label, label.length(), &rc2,
DT_SINGLELINE | DT_VCENTER);
} }
} }

32
src/msw/window.cpp
View File

@ -4411,35 +4411,9 @@ WXHBRUSH wxWindowMSW::MSWGetBgBrush(WXHDC hDC, WXHWND hWndToPaint)
bool wxWindowMSW::HandlePrintClient(WXHDC hDC) bool wxWindowMSW::HandlePrintClient(WXHDC hDC)
{ {
// we receive this message when DrawThemeParentBackground() is // TODO: handle wxBG_STYLE_CUSTOM and/or wxBG_STYLE_COLOUR here so when
// called from def window proc of several controls under XP and we // DrawParentThemeBackground() from uxtheme.dll is called we don't get
// must draw properly themed background here // the default background e.g. the border when custom drawing buttons
//
// note that naively I'd expect filling the client rect with the
// brush returned by MSWGetBgBrush() work -- but for some reason it
// doesn't and we have to call parents MSWPrintChild() which is
// supposed to call DrawThemeBackground() with appropriate params
//
// also note that in this case lParam == PRF_CLIENT but we're
// clearly expected to paint the background and nothing else!
if ( IsTopLevel() || InheritsBackgroundColour() )
return false;
// sometimes we don't want the parent to handle it at all, instead
// return whatever value this window wants
if ( !MSWShouldPropagatePrintChild() )
return MSWPrintChild(hDC, (wxWindow *)this);
for ( wxWindow *win = GetParent(); win; win = win->GetParent() )
{
if ( win->MSWPrintChild(hDC, (wxWindow *)this) )
return true;
if ( win->IsTopLevel() || win->InheritsBackgroundColour() )
break;
}
return false; return false;
} }