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

don't crash when invalid colour is set as fg/bg colour

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11193 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-07-27 13:30:16 +00:00
parent b6b85bdccb
commit 71ec83d2fd
2 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/gtk/dcclient.cpp
View File

@ -1379,7 +1379,6 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
{
gdk_gc_set_foreground( m_textGC, m_textBackgroundColour.GetColor() );
gdk_draw_rectangle( m_window, m_textGC, TRUE, x, y, width, height );
gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
}
gdk_draw_string( m_window, font, m_textGC, x, y + font->ascent, text.mbc_str() );
#endif
@ -1878,30 +1877,36 @@ void wxWindowDC::SetTextForeground( const wxColour &col )
{
wxCHECK_RET( Ok(), wxT("invalid window dc") );
if (m_textForegroundColour == col) return;
// 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.Ok() || (m_textForegroundColour == col) )
return;
m_textForegroundColour = col;
if (!m_textForegroundColour.Ok()) return;
if (!m_window) return;
m_textForegroundColour.CalcPixel( m_cmap );
gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
if ( m_window )
{
m_textForegroundColour.CalcPixel( m_cmap );
gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
}
}
void wxWindowDC::SetTextBackground( const wxColour &col )
{
wxCHECK_RET( Ok(), wxT("invalid window dc") );
if (m_textBackgroundColour == col) return;
// same as above
if ( !col.Ok() || (m_textBackgroundColour == col) )
return;
m_textBackgroundColour = col;
if (!m_textBackgroundColour.Ok()) return;
if (!m_window) return;
m_textBackgroundColour.CalcPixel( m_cmap );
gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
if ( m_window )
{
m_textBackgroundColour.CalcPixel( m_cmap );
gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
}
}
void wxWindowDC::SetBackgroundMode( int mode )

31
src/gtk1/dcclient.cpp
View File

@ -1379,7 +1379,6 @@ void wxWindowDC::DoDrawText( const wxString &text, wxCoord x, wxCoord y )
{
gdk_gc_set_foreground( m_textGC, m_textBackgroundColour.GetColor() );
gdk_draw_rectangle( m_window, m_textGC, TRUE, x, y, width, height );
gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
}
gdk_draw_string( m_window, font, m_textGC, x, y + font->ascent, text.mbc_str() );
#endif
@ -1878,30 +1877,36 @@ void wxWindowDC::SetTextForeground( const wxColour &col )
{
wxCHECK_RET( Ok(), wxT("invalid window dc") );
if (m_textForegroundColour == col) return;
// 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.Ok() || (m_textForegroundColour == col) )
return;
m_textForegroundColour = col;
if (!m_textForegroundColour.Ok()) return;
if (!m_window) return;
m_textForegroundColour.CalcPixel( m_cmap );
gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
if ( m_window )
{
m_textForegroundColour.CalcPixel( m_cmap );
gdk_gc_set_foreground( m_textGC, m_textForegroundColour.GetColor() );
}
}
void wxWindowDC::SetTextBackground( const wxColour &col )
{
wxCHECK_RET( Ok(), wxT("invalid window dc") );
if (m_textBackgroundColour == col) return;
// same as above
if ( !col.Ok() || (m_textBackgroundColour == col) )
return;
m_textBackgroundColour = col;
if (!m_textBackgroundColour.Ok()) return;
if (!m_window) return;
m_textBackgroundColour.CalcPixel( m_cmap );
gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
if ( m_window )
{
m_textBackgroundColour.CalcPixel( m_cmap );
gdk_gc_set_background( m_textGC, m_textBackgroundColour.GetColor() );
}
}
void wxWindowDC::SetBackgroundMode( int mode )