Disable typemap for wxImage constructors

[wxWidgets.git] / src / gtk1 / statbox.cpp

diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index 3bf811a25be7d0b8ae87c68b2971921205d975e1..d057ebbd4c92da5668ae7a6cfa65b585db59970a 100644 (file)
--- a/src/gtk1/statbox.cpp
+++ b/src/gtk1/statbox.cpp
@@ -91,10 +91,19 @@ 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 ) );
 }
 

-void wxStaticBox::ApplyWidgetStyle()
+void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style)

 {
 {

-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
+    gtk_widget_modify_style(m_widget, style);
+#ifdef __WXGTK20__
+    gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style);
+#endif
+}
+
+// static
+wxVisualAttributes
+wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_frame_new);

 }
 
 #endif // wxUSE_STATBOX
 }
 
 #endif // wxUSE_STATBOX