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

avoid accepting an invalid color, ignore it, as other ports do, fixes #13720

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69967 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-12-09 15:23:37 +00:00
parent 25fe875df6
commit 9c17ca3fe6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/dcgraph.cpp
View File

@@ -382,7 +382,10 @@ void wxGCDCImpl::SetTextForeground( const wxColour &col )
{ {
wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::SetTextForeground - invalid DC") ); wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::SetTextForeground - invalid DC") );
if ( col != m_textForegroundColour ) // don't set m_textForegroundColour to an invalid colour as we'd crash
// later then (we use m_textForegroundColour.GetColor() without checking
// in a few places)
if ( col.IsOk() && col != m_textForegroundColour )
{ {
m_textForegroundColour = col; m_textForegroundColour = col;
m_graphicContext->SetFont( m_font, m_textForegroundColour ); m_graphicContext->SetFont( m_font, m_textForegroundColour );