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

interpret m_has..Col, m_hasFont correctly

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2004-06-19 18:59:43 +00:00
parent 237302e704
commit 984e8d0b6b
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gtk/window.cpp
View File

@@ -4024,15 +4024,15 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
{ {
// do we need to apply any changes at all? // do we need to apply any changes at all?
if ( !forceStyle && if ( !forceStyle &&
!m_hasFont && !m_hasFgCol && !m_font.Ok() &&
(!m_hasBgCol || !m_backgroundColour.Ok()) ) !m_foregroundColour.Ok() && !m_backgroundColour.Ok() )
{ {
return NULL; return NULL;
} }
GtkRcStyle *style = gtk_rc_style_new(); GtkRcStyle *style = gtk_rc_style_new();
if ( m_hasFont ) if ( m_font.Ok() )
{ {
#ifdef __WXGTK20__ #ifdef __WXGTK20__
style->font_desc = style->font_desc =

6
src/gtk1/window.cpp
View File

@@ -4024,15 +4024,15 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
{ {
// do we need to apply any changes at all? // do we need to apply any changes at all?
if ( !forceStyle && if ( !forceStyle &&
!m_hasFont && !m_hasFgCol && !m_font.Ok() &&
(!m_hasBgCol || !m_backgroundColour.Ok()) ) !m_foregroundColour.Ok() && !m_backgroundColour.Ok() )
{ {
return NULL; return NULL;
} }
GtkRcStyle *style = gtk_rc_style_new(); GtkRcStyle *style = gtk_rc_style_new();
if ( m_hasFont ) if ( m_font.Ok() )
{ {
#ifdef __WXGTK20__ #ifdef __WXGTK20__
style->font_desc = style->font_desc =