From 7074ce3577987748739169a9475ffdc0f9873595 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 19 Jun 2004 17:49:26 +0000 Subject: [PATCH] moved DoApplyWidgetStyle to wxWindowGTK git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/control.h | 5 ----- include/wx/gtk/window.h | 4 ++++ include/wx/gtk1/control.h | 5 ----- include/wx/gtk1/window.h | 4 ++++ src/gtk/control.cpp | 16 ---------------- src/gtk/window.cpp | 16 +++++++++++----- src/gtk1/control.cpp | 16 ---------------- src/gtk1/window.cpp | 16 +++++++++++----- 8 files changed, 30 insertions(+), 52 deletions(-) diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h index c7954c415e..5d444e9b45 100644 --- a/include/wx/gtk/control.h +++ b/include/wx/gtk/control.h @@ -56,11 +56,6 @@ public: virtual wxVisualAttributes GetDefaultAttributes() const; protected: - 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); - virtual wxSize DoGetBestSize() const; void PostCreation(const wxSize& size); void PostSetLabel(); diff --git a/include/wx/gtk/window.h b/include/wx/gtk/window.h index 0a40f286cb..a2e8a9068b 100644 --- a/include/wx/gtk/window.h +++ b/include/wx/gtk/window.h @@ -264,6 +264,10 @@ protected: // Overridden in many GTK widgets who have to handle subwidgets 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); private: DECLARE_DYNAMIC_CLASS(wxWindowGTK) diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h index c7954c415e..5d444e9b45 100644 --- a/include/wx/gtk1/control.h +++ b/include/wx/gtk1/control.h @@ -56,11 +56,6 @@ public: virtual wxVisualAttributes GetDefaultAttributes() const; protected: - 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); - virtual wxSize DoGetBestSize() const; void PostCreation(const wxSize& size); void PostSetLabel(); diff --git a/include/wx/gtk1/window.h b/include/wx/gtk1/window.h index 0a40f286cb..a2e8a9068b 100644 --- a/include/wx/gtk1/window.h +++ b/include/wx/gtk1/window.h @@ -264,6 +264,10 @@ protected: // Overridden in many GTK widgets who have to handle subwidgets 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); private: DECLARE_DYNAMIC_CLASS(wxWindowGTK) diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp index ed8b2147e8..c12735e39b 100644 --- a/src/gtk/control.cpp +++ b/src/gtk/control.cpp @@ -278,21 +278,5 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustm return attr; } -void wxControl::ApplyWidgetStyle(bool forceStyle) -{ - GtkRcStyle *style = CreateWidgetStyle(forceStyle); - if ( style ) - { - DoApplyWidgetStyle(style); - gtk_rc_style_unref(style); - } -} - -void wxControl::DoApplyWidgetStyle(GtkRcStyle *style) -{ - gtk_widget_modify_style(m_widget, style); -} - - #endif // wxUSE_CONTROLS diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp index 8e5f4bdd3b..d0e909e82e 100644 --- a/src/gtk/window.cpp +++ b/src/gtk/window.cpp @@ -4090,15 +4090,21 @@ void wxWindowGTK::ApplyWidgetStyle(bool forceStyle) GtkRcStyle *style = CreateWidgetStyle(forceStyle); if ( style ) { - if (m_wxwindow) - // should we also do m_widget in this case? - gtk_widget_modify_style(m_wxwindow, style); - else - gtk_widget_modify_style(m_widget, style); + DoApplyWidgetStyle(style); gtk_rc_style_unref(style); } } +void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style) +{ + if (m_wxwindow) + // should we also do m_widget in this case? + gtk_widget_modify_style(m_wxwindow, style); + else + gtk_widget_modify_style(m_widget, style); +} + + //----------------------------------------------------------------------------- // Pop-up menu stuff //----------------------------------------------------------------------------- diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp index ed8b2147e8..c12735e39b 100644 --- a/src/gtk1/control.cpp +++ b/src/gtk1/control.cpp @@ -278,21 +278,5 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustm return attr; } -void wxControl::ApplyWidgetStyle(bool forceStyle) -{ - GtkRcStyle *style = CreateWidgetStyle(forceStyle); - if ( style ) - { - DoApplyWidgetStyle(style); - gtk_rc_style_unref(style); - } -} - -void wxControl::DoApplyWidgetStyle(GtkRcStyle *style) -{ - gtk_widget_modify_style(m_widget, style); -} - - #endif // wxUSE_CONTROLS diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp index 8e5f4bdd3b..d0e909e82e 100644 --- a/src/gtk1/window.cpp +++ b/src/gtk1/window.cpp @@ -4090,15 +4090,21 @@ void wxWindowGTK::ApplyWidgetStyle(bool forceStyle) GtkRcStyle *style = CreateWidgetStyle(forceStyle); if ( style ) { - if (m_wxwindow) - // should we also do m_widget in this case? - gtk_widget_modify_style(m_wxwindow, style); - else - gtk_widget_modify_style(m_widget, style); + DoApplyWidgetStyle(style); gtk_rc_style_unref(style); } } +void wxWindowGTK::DoApplyWidgetStyle(GtkRcStyle *style) +{ + if (m_wxwindow) + // should we also do m_widget in this case? + gtk_widget_modify_style(m_wxwindow, style); + else + gtk_widget_modify_style(m_widget, style); +} + + //----------------------------------------------------------------------------- // Pop-up menu stuff //----------------------------------------------------------------------------- -- 2.47.2