moved DoApplyWidgetStyle to wxWindowGTK

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

diff --git a/include/wx/gtk/control.h b/include/wx/gtk/control.h
index c7954c415e2b2c3b2a9adbdd2c20b5ac207f93a7..5d444e9b453d002d4907dbb68d64437963dd78f0 100644 (file)
--- a/include/wx/gtk/control.h
+++ b/include/wx/gtk/control.h
@@ -56,11 +56,6 @@ public:
     virtual wxVisualAttributes GetDefaultAttributes() const;
 
 protected:
     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();
     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 0a40f286cbf072103bf001d6e7725764e1d7fb1b..a2e8a9068b7be7598d8446f7d0c909a8f91225f4 100644 (file)
--- 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);
 
     // 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)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowGTK)

diff --git a/include/wx/gtk1/control.h b/include/wx/gtk1/control.h
index c7954c415e2b2c3b2a9adbdd2c20b5ac207f93a7..5d444e9b453d002d4907dbb68d64437963dd78f0 100644 (file)
--- a/include/wx/gtk1/control.h
+++ b/include/wx/gtk1/control.h
@@ -56,11 +56,6 @@ public:
     virtual wxVisualAttributes GetDefaultAttributes() const;
 
 protected:
     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();
     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 0a40f286cbf072103bf001d6e7725764e1d7fb1b..a2e8a9068b7be7598d8446f7d0c909a8f91225f4 100644 (file)
--- 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);
 
     // 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)
 
 private:
     DECLARE_DYNAMIC_CLASS(wxWindowGTK)

diff --git a/src/gtk/control.cpp b/src/gtk/control.cpp
index ed8b2147e84540abf8e75c377a131aeae5eecb02..c12735e39bd39badd3edd69f32eb8222f937078a 100644 (file)
--- a/src/gtk/control.cpp
+++ b/src/gtk/control.cpp
@@ -278,21 +278,5 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustm
     return attr;
 }
 
     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
 
 #endif // wxUSE_CONTROLS
 

diff --git a/src/gtk/window.cpp b/src/gtk/window.cpp
index 8e5f4bdd3b1400386a08e040eb32fc9cd1206748..d0e909e82e84bdc3097940531c9b405838b51aa8 100644 (file)
--- 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 )
     {
     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);
     }
 }
 
         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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Pop-up menu stuff
 //-----------------------------------------------------------------------------

diff --git a/src/gtk1/control.cpp b/src/gtk1/control.cpp
index ed8b2147e84540abf8e75c377a131aeae5eecb02..c12735e39bd39badd3edd69f32eb8222f937078a 100644 (file)
--- a/src/gtk1/control.cpp
+++ b/src/gtk1/control.cpp
@@ -278,21 +278,5 @@ wxControl::GetDefaultAttributesFromGTKWidget(GtkWidget* (*widget_new)(GtkAdjustm
     return attr;
 }
 
     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
 
 #endif // wxUSE_CONTROLS
 

diff --git a/src/gtk1/window.cpp b/src/gtk1/window.cpp
index 8e5f4bdd3b1400386a08e040eb32fc9cd1206748..d0e909e82e84bdc3097940531c9b405838b51aa8 100644 (file)
--- 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 )
     {
     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);
     }
 }
 
         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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Pop-up menu stuff
 //-----------------------------------------------------------------------------