From 40452e05839d958474a8be831632975035af3384 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 1 Apr 2004 12:45:24 +0000 Subject: [PATCH] only use font/colours in SetWidgetStyle() if they're set git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26544 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 819a909325..525ef71e7e 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -4166,7 +4166,7 @@ void wxWindowGTK::SetWidgetStyle() GtkStyle *style = GetWidgetStyle(); - if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT )) + if ( m_hasFont ) { #ifdef __WXGTK20__ pango_font_description_free( style->font_desc ); @@ -4177,7 +4177,7 @@ void wxWindowGTK::SetWidgetStyle() #endif } - if (m_foregroundColour.Ok()) + if ( m_hasFgCol ) { m_foregroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); if (m_foregroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT)) @@ -4203,7 +4203,7 @@ void wxWindowGTK::SetWidgetStyle() } } - if (m_backgroundColour.Ok()) + if ( m_hasBgCol ) { m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); if (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)) diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 819a909325..525ef71e7e 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -4166,7 +4166,7 @@ void wxWindowGTK::SetWidgetStyle() GtkStyle *style = GetWidgetStyle(); - if (m_font != wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT )) + if ( m_hasFont ) { #ifdef __WXGTK20__ pango_font_description_free( style->font_desc ); @@ -4177,7 +4177,7 @@ void wxWindowGTK::SetWidgetStyle() #endif } - if (m_foregroundColour.Ok()) + if ( m_hasFgCol ) { m_foregroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); if (m_foregroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNTEXT)) @@ -4203,7 +4203,7 @@ void wxWindowGTK::SetWidgetStyle() } } - if (m_backgroundColour.Ok()) + if ( m_hasBgCol ) { m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); if (m_backgroundColour != wxSystemSettings::GetColour(wxSYS_COLOUR_BTNFACE)) -- 2.47.2