From 5edef14ec87e7fe2e1c48ed5f1a466ba60ece81a Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 18 Jun 2004 08:02:01 +0000 Subject: [PATCH] reset fg/bg colour and font to default if set to wxNullColour/Font git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27878 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/control.h | 2 +- include/wx/gtk/window.h | 18 ++-- include/wx/gtk1/control.h | 2 +- include/wx/gtk1/window.h | 18 ++-- src/gtk/control.cpp | 4 +- src/gtk/window.cpp | 167 ++++++++++---------------------------- src/gtk1/control.cpp | 4 +- src/gtk1/window.cpp | 167 ++++++++++---------------------------- 8 files changed, 104 insertions(+), 278 deletions(-) diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index 417ad2083f..553f94f7c1 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -56,7 +56,7 @@ public: virtual wxVisualAttributes GetDefaultAttributes() const; protected: - virtual void ApplyWidgetStyle(); + virtual void ApplyWidgetStyle(bool forceStyle = false); // helper function to ease native widgets wrapping, called by // ApplyWidgetStyle -- override this, not ApplyWidgetStyle virtual void DoApplyWidgetStyle(GtkRcStyle *style); diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index a0496b7fb9..0a40f286cb 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -115,10 +115,6 @@ public: // Internal represention of Update() void GtkUpdate(); - // For delayed background - void GtkSetBackgroundColour( const wxColour &colour ); - void GtkSetForegroundColour( const wxColour &colour ); - // For compatibility across platforms (not in event table) void OnIdle(wxIdleEvent& WXUNUSED(event)) {} @@ -231,12 +227,6 @@ public: bool m_clipPaintRegion:1; // TRUE after ScrollWindow() bool m_queuedFullRedraw:1; // TRUE after DoMoveWindow - // These are true if the style were set before the widget was realized - // (typcally in the constructor) but the actual GTK style must not be set - // before the widget has been "realized" - bool m_delayedForegroundColour:1; - bool m_delayedBackgroundColour:1; - // C++ has no virtual methods in the constrcutor of any class but we need // different methods of inserting a child window into a wxFrame, // wxMDIFrame, wxNotebook etc. this is the callback that will get used. @@ -267,11 +257,13 @@ protected: // Called by ApplyWidgetStyle (which is called by SetFont() and // SetXXXColour etc to apply style changed to native widgets) to create - // modified GTK style with non-standard attributes. - GtkRcStyle *CreateWidgetStyle(); + // modified GTK style with non-standard attributes. If forceStyle=true, + // creates empty GtkRcStyle if there are no modifications, otherwise + // returns NULL in such case. + GtkRcStyle *CreateWidgetStyle(bool forceStyle = false); // Overridden in many GTK widgets who have to handle subwidgets - virtual void ApplyWidgetStyle(); + virtual void ApplyWidgetStyle(bool forceStyle = false); private: DECLARE_DYNAMIC_CLASS(wxWindowGTK) diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h index 417ad2083f..553f94f7c1 100644 --- a/include/wx/gtk1/control.h +++ b/include/wx/gtk1/control.h @@ -56,7 +56,7 @@ public: virtual wxVisualAttributes GetDefaultAttributes() const; protected: - virtual void ApplyWidgetStyle(); + virtual void ApplyWidgetStyle(bool forceStyle = false); // helper function to ease native widgets wrapping, called by // ApplyWidgetStyle -- override this, not ApplyWidgetStyle virtual void DoApplyWidgetStyle(GtkRcStyle *style); diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index a0496b7fb9..0a40f286cb 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -115,10 +115,6 @@ public: // Internal represention of Update() void GtkUpdate(); - // For delayed background - void GtkSetBackgroundColour( const wxColour &colour ); - void GtkSetForegroundColour( const wxColour &colour ); - // For compatibility across platforms (not in event table) void OnIdle(wxIdleEvent& WXUNUSED(event)) {} @@ -231,12 +227,6 @@ public: bool m_clipPaintRegion:1; // TRUE after ScrollWindow() bool m_queuedFullRedraw:1; // TRUE after DoMoveWindow - // These are true if the style were set before the widget was realized - // (typcally in the constructor) but the actual GTK style must not be set - // before the widget has been "realized" - bool m_delayedForegroundColour:1; - bool m_delayedBackgroundColour:1; - // C++ has no virtual methods in the constrcutor of any class but we need // different methods of inserting a child window into a wxFrame, // wxMDIFrame, wxNotebook etc. this is the callback that will get used. @@ -267,11 +257,13 @@ protected: // Called by ApplyWidgetStyle (which is called by SetFont() and // SetXXXColour etc to apply style changed to native widgets) to create - // modified GTK style with non-standard attributes. - GtkRcStyle *CreateWidgetStyle(); + // modified GTK style with non-standard attributes. If forceStyle=true, + // creates empty GtkRcStyle if there are no modifications, otherwise + // returns NULL in such case. + GtkRcStyle *CreateWidgetStyle(bool forceStyle = false); // Overridden in many GTK widgets who have to handle subwidgets - virtual void ApplyWidgetStyle(); + virtual void ApplyWidgetStyle(bool forceStyle = false); private: DECLARE_DYNAMIC_CLASS(wxWindowGTK) diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index e638c35d8d..053f18f1ea 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -267,9 +267,9 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustm return attr; } -void wxControl::ApplyWidgetStyle() +void wxControl::ApplyWidgetStyle(bool forceStyle) { - GtkRcStyle *style = CreateWidgetStyle(); + GtkRcStyle *style = CreateWidgetStyle(forceStyle); if ( style ) { DoApplyWidgetStyle(style); diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 4b7a6ed8ae..e9310bd3aa 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -2307,12 +2307,6 @@ gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win ) if (g_isIdle) wxapp_install_idle_handler(); - if (win->m_delayedBackgroundColour) - win->GtkSetBackgroundColour( win->GetBackgroundColour() ); - - if (win->m_delayedForegroundColour) - win->GtkSetForegroundColour( win->GetForegroundColour() ); - #ifdef __WXGTK20__ if (win->m_imContext) { @@ -2575,9 +2569,6 @@ void wxWindowGTK::Init() m_cursor = *wxSTANDARD_CURSOR; - m_delayedForegroundColour = FALSE; - m_delayedBackgroundColour = FALSE; - #ifdef __WXGTK20__ m_imContext = NULL; m_x11Context = NULL; @@ -2622,9 +2613,6 @@ bool wxWindowGTK::Create( wxWindow *parent, m_insertCallback = wxInsertChildInWindow; - // always needed for background clearing - m_delayedBackgroundColour = TRUE; - m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); @@ -3975,74 +3963,24 @@ void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) } #endif // wxUSE_TOOLTIPS -void wxWindowGTK::GtkSetBackgroundColour( const wxColour &colour ) -{ - GdkWindow *window = (GdkWindow*) NULL; - if (m_wxwindow) - window = GTK_PIZZA(m_wxwindow)->bin_window; - else - window = GetConnectWidget()->window; - - wxASSERT( window ); - - // This will work around the fact that I don't know what to do to reset to - // theme settings when colour == wxNullColour, GetBackgroundColour will - // fetch the default if needed, giving us a valid colour to use below. - // Vaclav needs to help here to implement the RightThing... - wxColour newColour = GetBackgroundColour(); - - // We need the pixel value e.g. for background clearing. - newColour.CalcPixel( gdk_window_get_colormap( window ) ); - - if (m_wxwindow) - { - // wxMSW doesn't clear the window here, either. - gdk_window_set_background( window, newColour.GetColor() ); - } - - ApplyWidgetStyle(); -} - bool wxWindowGTK::SetBackgroundColour( const wxColour &colour ) { - wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") ); + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") ); if (!wxWindowBase::SetBackgroundColour(colour)) return false; - GdkWindow *window = (GdkWindow*) NULL; - if (m_wxwindow) - window = GTK_PIZZA(m_wxwindow)->bin_window; - else - window = GetConnectWidget()->window; - - if (!window) - { - // indicate that a new style has been set - // but it couldn't get applied as the - // widget hasn't been realized yet. - m_delayedBackgroundColour = true; - return true; - } - else + if (colour.Ok()) { - GtkSetBackgroundColour( colour ); + // We need the pixel value e.g. for background clearing. + m_backgroundColour.CalcPixel(gtk_widget_get_colormap(m_widget)); } - return true; -} - -void wxWindowGTK::GtkSetForegroundColour( const wxColour &colour ) -{ - GdkWindow *window = (GdkWindow*) NULL; - if (m_wxwindow) - window = GTK_PIZZA(m_wxwindow)->bin_window; - else - window = GetConnectWidget()->window; - - wxASSERT( window ); + // apply style change (forceStyle=true so that new style is applied + // even if the bg colour changed from valid to wxNullColour): + ApplyWidgetStyle(true); - ApplyWidgetStyle(); + return true; } bool wxWindowGTK::SetForegroundColour( const wxColour &colour ) @@ -4051,29 +3989,19 @@ bool wxWindowGTK::SetForegroundColour( const wxColour &colour ) if (!wxWindowBase::SetForegroundColour(colour)) { - // don't leave if the GTK widget has just - // been realized - if (!m_delayedForegroundColour) return false; - } - - GdkWindow *window = (GdkWindow*) NULL; - if (m_wxwindow) - window = GTK_PIZZA(m_wxwindow)->bin_window; - else - window = GetConnectWidget()->window; - - if (!window) - { - // indicate that a new style has been set - // but it couldn't get applied as the - // widget hasn't been realized yet. - m_delayedForegroundColour = true; + return false; } - else + + if (colour.Ok()) { - GtkSetForegroundColour( colour ); + // We need the pixel value e.g. for background clearing. + m_foregroundColour.CalcPixel(gtk_widget_get_colormap(m_widget)); } + // apply style change (forceStyle=true so that new style is applied + // even if the bg colour changed from valid to wxNullColour): + ApplyWidgetStyle(true); + return true; } @@ -4092,10 +4020,11 @@ PangoContext *wxWindowGTK::GtkGetPangoX11Context() } #endif -GtkRcStyle *wxWindowGTK::CreateWidgetStyle() +GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) { // do we need to apply any changes at all? - if ( !m_hasFont && !m_hasFgCol && + if ( !forceStyle && + !m_hasFont && !m_hasFgCol && (!m_hasBgCol || !m_backgroundColour.Ok()) ) { return NULL; @@ -4116,39 +4045,39 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle() if ( m_hasFgCol ) { - m_foregroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); + GdkColor *fg = m_foregroundColour.GetColor(); - style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor(); + style->fg[GTK_STATE_NORMAL] = *fg; style->color_flags[GTK_STATE_NORMAL] = GTK_RC_FG; - style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor(); + style->fg[GTK_STATE_PRELIGHT] = *fg; style->color_flags[GTK_STATE_PRELIGHT] = GTK_RC_FG; - style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor(); + style->fg[GTK_STATE_ACTIVE] = *fg; style->color_flags[GTK_STATE_ACTIVE] = GTK_RC_FG; } - if ( m_hasBgCol && m_backgroundColour.Ok() ) + if ( m_hasBgCol ) { - m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); - - style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor(); - style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor(); + GdkColor *bg = m_backgroundColour.GetColor(); + + style->bg[GTK_STATE_NORMAL] = *bg; + style->base[GTK_STATE_NORMAL] = *bg; style->color_flags[GTK_STATE_NORMAL] = (GtkRcFlags) (style->color_flags[GTK_STATE_NORMAL] | GTK_RC_BG | GTK_RC_BASE); - style->bg[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor(); - style->base[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor(); + style->bg[GTK_STATE_PRELIGHT] = *bg; + style->base[GTK_STATE_PRELIGHT] = *bg; style->color_flags[GTK_STATE_PRELIGHT] = (GtkRcFlags) (style->color_flags[GTK_STATE_PRELIGHT] | GTK_RC_BG | GTK_RC_BASE); - style->bg[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor(); - style->base[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor(); + style->bg[GTK_STATE_ACTIVE] = *bg; + style->base[GTK_STATE_ACTIVE] = *bg; style->color_flags[GTK_STATE_ACTIVE] = (GtkRcFlags) (style->color_flags[GTK_STATE_ACTIVE] | GTK_RC_BG | GTK_RC_BASE); - style->bg[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor(); - style->base[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor(); + style->bg[GTK_STATE_INSENSITIVE] = *bg; + style->base[GTK_STATE_INSENSITIVE] = *bg; style->color_flags[GTK_STATE_INSENSITIVE] = (GtkRcFlags) (style->color_flags[GTK_STATE_INSENSITIVE] | GTK_RC_BG | GTK_RC_BASE); } @@ -4156,7 +4085,7 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle() return style; } -void wxWindowGTK::ApplyWidgetStyle() +void wxWindowGTK::ApplyWidgetStyle(bool WXUNUSED(forceStyle)) { } @@ -4302,24 +4231,16 @@ bool wxWindowGTK::IsOwnGtkWindow( GdkWindow *window ) bool wxWindowGTK::SetFont( const wxFont &font ) { - if (!wxWindowBase::SetFont(font) || !m_widget) - { - return FALSE; - } + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") ); - wxColour sysbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ); - if ( sysbg == m_backgroundColour ) - { - m_backgroundColour = wxNullColour; - ApplyWidgetStyle(); - m_backgroundColour = sysbg; - } - else - { - ApplyWidgetStyle(); - } + if (!wxWindowBase::SetFont(font)) + return false; - return TRUE; + // apply style change (forceStyle=true so that new style is applied + // even if the font changed from valid to wxNullFont): + ApplyWidgetStyle(true); + + return true; } void wxWindowGTK::DoCaptureMouse() diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp index e638c35d8d..053f18f1ea 100644 --- a/src/gtk1/control.cpp +++ b/src/gtk1/control.cpp @@ -267,9 +267,9 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustm return attr; } -void wxControl::ApplyWidgetStyle() +void wxControl::ApplyWidgetStyle(bool forceStyle) { - GtkRcStyle *style = CreateWidgetStyle(); + GtkRcStyle *style = CreateWidgetStyle(forceStyle); if ( style ) { DoApplyWidgetStyle(style); diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 4b7a6ed8ae..e9310bd3aa 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -2307,12 +2307,6 @@ gtk_window_realized_callback( GtkWidget *m_widget, wxWindow *win ) if (g_isIdle) wxapp_install_idle_handler(); - if (win->m_delayedBackgroundColour) - win->GtkSetBackgroundColour( win->GetBackgroundColour() ); - - if (win->m_delayedForegroundColour) - win->GtkSetForegroundColour( win->GetForegroundColour() ); - #ifdef __WXGTK20__ if (win->m_imContext) { @@ -2575,9 +2569,6 @@ void wxWindowGTK::Init() m_cursor = *wxSTANDARD_CURSOR; - m_delayedForegroundColour = FALSE; - m_delayedBackgroundColour = FALSE; - #ifdef __WXGTK20__ m_imContext = NULL; m_x11Context = NULL; @@ -2622,9 +2613,6 @@ bool wxWindowGTK::Create( wxWindow *parent, m_insertCallback = wxInsertChildInWindow; - // always needed for background clearing - m_delayedBackgroundColour = TRUE; - m_widget = gtk_scrolled_window_new( (GtkAdjustment *) NULL, (GtkAdjustment *) NULL ); GTK_WIDGET_UNSET_FLAGS( m_widget, GTK_CAN_FOCUS ); @@ -3975,74 +3963,24 @@ void wxWindowGTK::ApplyToolTip( GtkTooltips *tips, const wxChar *tip ) } #endif // wxUSE_TOOLTIPS -void wxWindowGTK::GtkSetBackgroundColour( const wxColour &colour ) -{ - GdkWindow *window = (GdkWindow*) NULL; - if (m_wxwindow) - window = GTK_PIZZA(m_wxwindow)->bin_window; - else - window = GetConnectWidget()->window; - - wxASSERT( window ); - - // This will work around the fact that I don't know what to do to reset to - // theme settings when colour == wxNullColour, GetBackgroundColour will - // fetch the default if needed, giving us a valid colour to use below. - // Vaclav needs to help here to implement the RightThing... - wxColour newColour = GetBackgroundColour(); - - // We need the pixel value e.g. for background clearing. - newColour.CalcPixel( gdk_window_get_colormap( window ) ); - - if (m_wxwindow) - { - // wxMSW doesn't clear the window here, either. - gdk_window_set_background( window, newColour.GetColor() ); - } - - ApplyWidgetStyle(); -} - bool wxWindowGTK::SetBackgroundColour( const wxColour &colour ) { - wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") ); + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") ); if (!wxWindowBase::SetBackgroundColour(colour)) return false; - GdkWindow *window = (GdkWindow*) NULL; - if (m_wxwindow) - window = GTK_PIZZA(m_wxwindow)->bin_window; - else - window = GetConnectWidget()->window; - - if (!window) - { - // indicate that a new style has been set - // but it couldn't get applied as the - // widget hasn't been realized yet. - m_delayedBackgroundColour = true; - return true; - } - else + if (colour.Ok()) { - GtkSetBackgroundColour( colour ); + // We need the pixel value e.g. for background clearing. + m_backgroundColour.CalcPixel(gtk_widget_get_colormap(m_widget)); } - return true; -} - -void wxWindowGTK::GtkSetForegroundColour( const wxColour &colour ) -{ - GdkWindow *window = (GdkWindow*) NULL; - if (m_wxwindow) - window = GTK_PIZZA(m_wxwindow)->bin_window; - else - window = GetConnectWidget()->window; - - wxASSERT( window ); + // apply style change (forceStyle=true so that new style is applied + // even if the bg colour changed from valid to wxNullColour): + ApplyWidgetStyle(true); - ApplyWidgetStyle(); + return true; } bool wxWindowGTK::SetForegroundColour( const wxColour &colour ) @@ -4051,29 +3989,19 @@ bool wxWindowGTK::SetForegroundColour( const wxColour &colour ) if (!wxWindowBase::SetForegroundColour(colour)) { - // don't leave if the GTK widget has just - // been realized - if (!m_delayedForegroundColour) return false; - } - - GdkWindow *window = (GdkWindow*) NULL; - if (m_wxwindow) - window = GTK_PIZZA(m_wxwindow)->bin_window; - else - window = GetConnectWidget()->window; - - if (!window) - { - // indicate that a new style has been set - // but it couldn't get applied as the - // widget hasn't been realized yet. - m_delayedForegroundColour = true; + return false; } - else + + if (colour.Ok()) { - GtkSetForegroundColour( colour ); + // We need the pixel value e.g. for background clearing. + m_foregroundColour.CalcPixel(gtk_widget_get_colormap(m_widget)); } + // apply style change (forceStyle=true so that new style is applied + // even if the bg colour changed from valid to wxNullColour): + ApplyWidgetStyle(true); + return true; } @@ -4092,10 +4020,11 @@ PangoContext *wxWindowGTK::GtkGetPangoX11Context() } #endif -GtkRcStyle *wxWindowGTK::CreateWidgetStyle() +GtkRcStyle *wxWindowGTK::CreateWidgetStyle(bool forceStyle) { // do we need to apply any changes at all? - if ( !m_hasFont && !m_hasFgCol && + if ( !forceStyle && + !m_hasFont && !m_hasFgCol && (!m_hasBgCol || !m_backgroundColour.Ok()) ) { return NULL; @@ -4116,39 +4045,39 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle() if ( m_hasFgCol ) { - m_foregroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); + GdkColor *fg = m_foregroundColour.GetColor(); - style->fg[GTK_STATE_NORMAL] = *m_foregroundColour.GetColor(); + style->fg[GTK_STATE_NORMAL] = *fg; style->color_flags[GTK_STATE_NORMAL] = GTK_RC_FG; - style->fg[GTK_STATE_PRELIGHT] = *m_foregroundColour.GetColor(); + style->fg[GTK_STATE_PRELIGHT] = *fg; style->color_flags[GTK_STATE_PRELIGHT] = GTK_RC_FG; - style->fg[GTK_STATE_ACTIVE] = *m_foregroundColour.GetColor(); + style->fg[GTK_STATE_ACTIVE] = *fg; style->color_flags[GTK_STATE_ACTIVE] = GTK_RC_FG; } - if ( m_hasBgCol && m_backgroundColour.Ok() ) + if ( m_hasBgCol ) { - m_backgroundColour.CalcPixel( gtk_widget_get_colormap( m_widget ) ); - - style->bg[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor(); - style->base[GTK_STATE_NORMAL] = *m_backgroundColour.GetColor(); + GdkColor *bg = m_backgroundColour.GetColor(); + + style->bg[GTK_STATE_NORMAL] = *bg; + style->base[GTK_STATE_NORMAL] = *bg; style->color_flags[GTK_STATE_NORMAL] = (GtkRcFlags) (style->color_flags[GTK_STATE_NORMAL] | GTK_RC_BG | GTK_RC_BASE); - style->bg[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor(); - style->base[GTK_STATE_PRELIGHT] = *m_backgroundColour.GetColor(); + style->bg[GTK_STATE_PRELIGHT] = *bg; + style->base[GTK_STATE_PRELIGHT] = *bg; style->color_flags[GTK_STATE_PRELIGHT] = (GtkRcFlags) (style->color_flags[GTK_STATE_PRELIGHT] | GTK_RC_BG | GTK_RC_BASE); - style->bg[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor(); - style->base[GTK_STATE_ACTIVE] = *m_backgroundColour.GetColor(); + style->bg[GTK_STATE_ACTIVE] = *bg; + style->base[GTK_STATE_ACTIVE] = *bg; style->color_flags[GTK_STATE_ACTIVE] = (GtkRcFlags) (style->color_flags[GTK_STATE_ACTIVE] | GTK_RC_BG | GTK_RC_BASE); - style->bg[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor(); - style->base[GTK_STATE_INSENSITIVE] = *m_backgroundColour.GetColor(); + style->bg[GTK_STATE_INSENSITIVE] = *bg; + style->base[GTK_STATE_INSENSITIVE] = *bg; style->color_flags[GTK_STATE_INSENSITIVE] = (GtkRcFlags) (style->color_flags[GTK_STATE_INSENSITIVE] | GTK_RC_BG | GTK_RC_BASE); } @@ -4156,7 +4085,7 @@ GtkRcStyle *wxWindowGTK::CreateWidgetStyle() return style; } -void wxWindowGTK::ApplyWidgetStyle() +void wxWindowGTK::ApplyWidgetStyle(bool WXUNUSED(forceStyle)) { } @@ -4302,24 +4231,16 @@ bool wxWindowGTK::IsOwnGtkWindow( GdkWindow *window ) bool wxWindowGTK::SetFont( const wxFont &font ) { - if (!wxWindowBase::SetFont(font) || !m_widget) - { - return FALSE; - } + wxCHECK_MSG( m_widget != NULL, FALSE, wxT("invalid window") ); - wxColour sysbg = wxSystemSettings::GetColour( wxSYS_COLOUR_BTNFACE ); - if ( sysbg == m_backgroundColour ) - { - m_backgroundColour = wxNullColour; - ApplyWidgetStyle(); - m_backgroundColour = sysbg; - } - else - { - ApplyWidgetStyle(); - } + if (!wxWindowBase::SetFont(font)) + return false; - return TRUE; + // apply style change (forceStyle=true so that new style is applied + // even if the font changed from valid to wxNullFont): + ApplyWidgetStyle(true); + + return true; } void wxWindowGTK::DoCaptureMouse() -- 2.45.2