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

fixed DrawText to use text colours instead of pen+brush colours

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41344 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-09-21 12:56:28 +00:00
parent 341f776cf0
commit 3dcc2231fa
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/dfb/dc.cpp
View File

@@ -259,7 +259,8 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{ {
SelectColour(m_brush.GetColour()); SelectColour(m_brush.GetColour());
m_surface->FillRectangle(xx, yy, ww, hh); m_surface->FillRectangle(xx, yy, ww, hh);
// restore pen's colour // restore pen's colour, because other drawing functions expect the
// colour to be set to the pen:
SelectColour(m_pen.GetColour()); SelectColour(m_pen.GetColour());
} }
@@ -309,16 +310,22 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y)
// if background mode is solid, DrawText must paint text's background: // if background mode is solid, DrawText must paint text's background:
if ( m_backgroundMode == wxSOLID ) if ( m_backgroundMode == wxSOLID )
{ {
wxCHECK_RET( m_backgroundBrush.Ok(), wxT("invalid background brush") ); wxCHECK_RET( m_textBackgroundColour.Ok(),
wxT("invalid background color") );
SelectColour(m_backgroundBrush.GetColour()); SelectColour(m_textBackgroundColour);
m_surface->FillRectangle(xx, yy, XLOG2DEVREL(w), YLOG2DEVREL(h)); m_surface->FillRectangle(xx, yy, XLOG2DEVREL(w), YLOG2DEVREL(h));
// restore pen's colour
SelectColour(m_pen.GetColour());
} }
// finally draw the text itself: // finally draw the text itself:
wxCHECK_RET( m_textForegroundColour.Ok(),
wxT("invalid foreground color") );
SelectColour(m_textForegroundColour);
m_surface->DrawString(wxSTR_TO_DFB(text), -1, xx, yy, DSTF_LEFT | DSTF_TOP); m_surface->DrawString(wxSTR_TO_DFB(text), -1, xx, yy, DSTF_LEFT | DSTF_TOP);
// restore pen's colour, because other drawing functions expect the colour
// to be set to the pen:
SelectColour(m_pen.GetColour());
} }
void wxDC::DoDrawRotatedText(const wxString& text, void wxDC::DoDrawRotatedText(const wxString& text,