X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d23a4bf410a7988864899b39fafaec8b3034f10..edc1cd8baf42910840cd2f86351f417868f9c1a9:/src/gtk1/statbox.cpp diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp index fdc5f6eb5e..3884e299b7 100644 --- a/src/gtk1/statbox.cpp +++ b/src/gtk1/statbox.cpp @@ -58,19 +58,14 @@ bool wxStaticBox::Create( wxWindow *parent, return FALSE; } - m_isStaticBox = TRUE; + wxControl::SetLabel(label); - if (label.empty()) - m_widget = gtk_frame_new( (char*) NULL ); - else - m_widget = gtk_frame_new( m_label.mbc_str() ); + m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : m_label.mbc_str()); m_parent->DoAddChild( this ); PostCreation(); - SetLabel(label); - InheritAttributes(); // need to set non default alignment? @@ -84,7 +79,7 @@ bool wxStaticBox::Create( wxWindow *parent, if ( xalign ) gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0); - + Show( TRUE ); return TRUE; @@ -94,7 +89,8 @@ void wxStaticBox::SetLabel( const wxString &label ) { wxControl::SetLabel( label ); - gtk_frame_set_label( GTK_FRAME( m_widget ), GetLabel().mbc_str() ); + gtk_frame_set_label( GTK_FRAME( m_widget ), + m_label.empty() ? (char *)NULL : m_label.mbc_str() ); } void wxStaticBox::ApplyWidgetStyle()