Not sure how important that is, but now you

    can set the font of a static box.

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

diff --git a/include/wx/gtk/statbox.h b/include/wx/gtk/statbox.h
index 2bedf27d46e760b227bc5b68ae3ee441e4bc31e8..b63c97324eeb8369d527e06af488a867cbb426ee 100644 (file)
--- a/include/wx/gtk/statbox.h
+++ b/include/wx/gtk/statbox.h
@@ -40,6 +40,8 @@ public:
 
     virtual void SetLabel( const wxString &label );
 
 
     virtual void SetLabel( const wxString &label );
 

+    bool SetFont( const wxFont &font );
+    

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

diff --git a/include/wx/gtk1/statbox.h b/include/wx/gtk1/statbox.h
index 2bedf27d46e760b227bc5b68ae3ee441e4bc31e8..b63c97324eeb8369d527e06af488a867cbb426ee 100644 (file)
--- a/include/wx/gtk1/statbox.h
+++ b/include/wx/gtk1/statbox.h
@@ -40,6 +40,8 @@ public:
 
     virtual void SetLabel( const wxString &label );
 
 
     virtual void SetLabel( const wxString &label );
 

+    bool SetFont( const wxFont &font );
+    

     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 7c3eb9678ee91cdea241dfb38a7121f90fe2cd64..a15681c0619017a1649d623c47a3340641d12c92 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -91,6 +91,21 @@ void wxStaticBox::SetLabel( const wxString &label )
                          m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
 }
 
                          m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
 }
 

+bool wxStaticBox::SetFont( const wxFont &font )
+{
+    wxControl::SetFont( font );
+
+    if (GTK_FRAME(m_widget)->label_widget)
+    {
+        GtkRcStyle *style = CreateWidgetStyle(true);
+        if ( style )
+        {
+            gtk_widget_modify_style( GTK_FRAME(m_widget)->label_widget, style);
+            gtk_rc_style_unref(style);
+        }
+    }
+}
+

 // static
 wxVisualAttributes
 wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))

diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index 7c3eb9678ee91cdea241dfb38a7121f90fe2cd64..a15681c0619017a1649d623c47a3340641d12c92 100644 (file)
--- a/src/gtk1/statbox.cpp
+++ b/src/gtk1/statbox.cpp
@@ -91,6 +91,21 @@ void wxStaticBox::SetLabel( const wxString &label )
                          m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
 }
 
                          m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
 }
 

+bool wxStaticBox::SetFont( const wxFont &font )
+{
+    wxControl::SetFont( font );
+
+    if (GTK_FRAME(m_widget)->label_widget)
+    {
+        GtkRcStyle *style = CreateWidgetStyle(true);
+        if ( style )
+        {
+            gtk_widget_modify_style( GTK_FRAME(m_widget)->label_widget, style);
+            gtk_rc_style_unref(style);
+        }
+    }
+}
+

 // static
 wxVisualAttributes
 wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
 // static
 wxVisualAttributes
 wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))