X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..8f2ee25db4652f96f28bc8f8370bebc974e533ff:/src/gtk/statbox.cpp diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp index 6610fad49d..d057ebbd4c 100644 --- a/src/gtk/statbox.cpp +++ b/src/gtk/statbox.cpp @@ -66,9 +66,7 @@ bool wxStaticBox::Create( wxWindow *parent, m_parent->DoAddChild( this ); - PostCreation(); - - InheritAttributes(); + PostCreation(size); // need to set non default alignment? gfloat xalign; @@ -82,8 +80,6 @@ bool wxStaticBox::Create( wxWindow *parent, if ( xalign ) gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0); - Show( TRUE ); - return TRUE; } @@ -95,10 +91,19 @@ void wxStaticBox::SetLabel( const wxString &label ) m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) ); } -void wxStaticBox::ApplyWidgetStyle() +void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style) +{ + 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)) { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + return GetDefaultAttributesFromGTKWidget(gtk_frame_new); } #endif // wxUSE_STATBOX