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

refactored code to do brush adjustment for bg drawing in only one place

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-11-19 19:53:03 +00:00
parent 48fa6bd38a
commit 5c836c463a
3 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/msw/notebook.cpp
View File

@@ -888,32 +888,40 @@ void wxNotebook::UpdateBgBrush()
}
}
WXHBRUSH wxNotebook::GetThemeBackgroundBrush(WXHDC hDC, wxWindow *win) const
{
if ( m_hbrBackground )
{
// before drawing with the background brush, we need to position it
// correctly
RECT rc;
::GetWindowRect(GetHwndOf(win), &rc);
::MapWindowPoints(NULL, GetHwnd(), (POINT *)&rc, 1);
if ( !::SetBrushOrgEx((HDC)hDC, -rc.left, -rc.top, NULL) )
{
wxLogLastError(_T("SetBrushOrgEx(notebook bg brush)"));
}
}
return m_hbrBackground;
}
void wxNotebook::DoEraseBackground(wxEraseEvent& event)
{
// we can either draw the background ourselves or let DrawThemeBackground()
// do it, but as we already have the correct brush, let's do it ourselves
// (note that we use the same code in wxControl::MSWControlColor(), so if
// it breaks, it should at least break in consistent way)
if ( m_hbrBackground )
wxWindow *win = (wxWindow *)event.GetEventObject();
HDC hdc = GetHdcOf(*event.GetDC());
WXHBRUSH hbr = GetThemeBackgroundBrush((WXHDC)hdc, win);
if ( hbr )
{
// before drawing with the background brush, we need to position it
// correctly
wxWindow *win = (wxWindow *)event.GetEventObject();
RECT rc;
::GetWindowRect(GetHwndOf(win), &rc);
::MapWindowPoints(NULL, GetHwnd(), (POINT *)&rc, 1);
HDC hdc = GetHdcOf(*event.GetDC());
if ( !::SetBrushOrgEx(hdc, -rc.left, -rc.top, NULL) )
{
wxLogLastError(_T("SetBrushOrgEx(notebook bg brush)"));
}
RECT rectClient;
::GetClientRect(GetHwndOf(win), &rectClient);
::FillRect(hdc, &rectClient, (HBRUSH)m_hbrBackground);
::FillRect(hdc, &rectClient, (HBRUSH)hbr);
}
}