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

SetFont may temporarily rset the background to wxNullColour before

Browse Source 
calling ApplyWidgetStyle, so make sure we don't use an invalid colour.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26920 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2004-04-22 22:04:24 +00:00
parent d36d8dd7d2
commit 57fbd4359a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtk/window.cpp
View File

@@ -4206,7 +4206,7 @@ void wxWindowGTK::SetWidgetStyle()
} }
} }
if ( m_hasBgCol ) if ( m_hasBgCol && m_backgroundColour.Ok() )
{ {
m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) );
if (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)) if (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))

2
src/gtk1/window.cpp
View File

@@ -4206,7 +4206,7 @@ void wxWindowGTK::SetWidgetStyle()
} }
} }
if ( m_hasBgCol ) if ( m_hasBgCol && m_backgroundColour.Ok() )
{ {
m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) );
if (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)) if (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE))