From 984e8d0b6b939898447794fc1af930651c66abe6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 19 Jun 2004 18:59:43 +0000 Subject: [PATCH] interpret m_has..Col, m_hasFont correctly git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27903 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/window.cpp | 6 +++--- src/gtk1/window.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index d0e909e82e..66d9e909d4 100644 --- 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 d0e909e82e..66d9e909d4 100644 --- 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 = -- 2.45.2