X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abdeb9e7006488bf917d90048fcd0cbe22f44a71..2e2a55b22eebde25797bd030660d8c644bc7700b:/src/gtk1/statbox.cpp diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp index 3bf811a25b..313a7ab44f 100644 --- a/src/gtk1/statbox.cpp +++ b/src/gtk1/statbox.cpp @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "statbox.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -78,7 +74,7 @@ bool wxStaticBox::Create( wxWindow *parent, xalign = 0.0; if ( xalign ) - gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0); + gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.5); return TRUE; } @@ -91,10 +87,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