interpret m_has..Col, m_hasFont correctly

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index d0e909e82e84bdc3097940531c9b405838b51aa8..66d9e909d48f252336fde90f62091dd8d8c8adb8 100644 (file)
--- a/src/gtk/window.cpp
+++ b/src/gtk/window.cpp
@@ -4024,15 +4024,15 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
 {
     // do we need to apply any changes at all?
     if ( !forceStyle &&
-         !m_hasFont && !m_hasFgCol &&
-         (!m_hasBgCol || !m_backgroundColour.Ok()) )
+         !m_font.Ok() &&
+         !m_foregroundColour.Ok() && !m_backgroundColour.Ok() )
     {
         return NULL;
     }
 
     GtkRcStyle *style = gtk_rc_style_new();
 
-    if ( m_hasFont )
+    if ( m_font.Ok() )
     {
 #ifdef __WXGTK20__
         style->font_desc = 

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index d0e909e82e84bdc3097940531c9b405838b51aa8..66d9e909d48f252336fde90f62091dd8d8c8adb8 100644 (file)
--- a/src/gtk1/window.cpp
+++ b/src/gtk1/window.cpp
@@ -4024,15 +4024,15 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle)
 {
     // do we need to apply any changes at all?
     if ( !forceStyle &&
-         !m_hasFont && !m_hasFgCol &&
-         (!m_hasBgCol || !m_backgroundColour.Ok()) )
+         !m_font.Ok() &&
+         !m_foregroundColour.Ok() && !m_backgroundColour.Ok() )
     {
         return NULL;
     }
 
     GtkRcStyle *style = gtk_rc_style_new();
 
-    if ( m_hasFont )
+    if ( m_font.Ok() )
     {
 #ifdef __WXGTK20__
         style->font_desc =