X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fa2540e3053924525d7656fe106ee6bf4941ca41..9419b0d64948485ab83122484ffe4b7dcde25905:/src/gtk1/statbox.cpp?ds=sidebyside diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp index 3884e299b7..a2542e88e2 100644 --- a/src/gtk1/statbox.cpp +++ b/src/gtk1/statbox.cpp @@ -7,15 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "statbox.h" -#endif - -#include "wx/defs.h" +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" #if wxUSE_STATBOX #include "wx/statbox.h" +#include "wx/gtk1/private.h" #include "gdk/gdk.h" #include "gtk/gtk.h" @@ -58,15 +56,12 @@ bool wxStaticBox::Create( wxWindow *parent, return FALSE; } - wxControl::SetLabel(label); - - m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : m_label.mbc_str()); + m_widget = gtk_frame_new(NULL); + SetLabel(label); m_parent->DoAddChild( this ); - PostCreation(); - - InheritAttributes(); + PostCreation(size); // need to set non default alignment? gfloat xalign; @@ -77,26 +72,29 @@ bool wxStaticBox::Create( wxWindow *parent, else // wxALIGN_LEFT xalign = 0.0; - if ( xalign ) - gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0); - - Show( TRUE ); + if ( style & (wxALIGN_RIGHT | wxALIGN_CENTER) ) // left alignment is default + gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.5); return TRUE; } -void wxStaticBox::SetLabel( const wxString &label ) +void wxStaticBox::SetLabel( const wxString& label ) { - wxControl::SetLabel( label ); + wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") ); - gtk_frame_set_label( GTK_FRAME( m_widget ), - m_label.empty() ? (char *)NULL : m_label.mbc_str() ); + GTKSetLabelForFrame(GTK_FRAME(m_widget), label); +} + +void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style) +{ + gtk_widget_modify_style(m_widget, style); } -void wxStaticBox::ApplyWidgetStyle() +// static +wxVisualAttributes +wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + return GetDefaultAttributesFromGTKWidget(gtk_frame_new); } #endif // wxUSE_STATBOX