X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e90c1d2a19361551eb07778280f22be3e759cf64..5d6c4365363f84bf587c7f5f916e5830ef8a11e3:/src/gtk1/statbox.cpp diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp index 0d4f598a2a..febadd9639 100644 --- a/src/gtk1/statbox.cpp +++ b/src/gtk1/statbox.cpp @@ -11,10 +11,12 @@ #pragma implementation "statbox.h" #endif -#include "wx/statbox.h" +#include "wx/defs.h" #if wxUSE_STATBOX +#include "wx/statbox.h" + #include "gdk/gdk.h" #include "gtk/gtk.h" @@ -44,23 +46,27 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { - wxFAIL_MSG( T("wxStaticBox creation failed") ); - return FALSE; + wxFAIL_MSG( wxT("wxStaticBox creation failed") ); + return FALSE; } m_isStaticBox = TRUE; - - m_widget = gtk_frame_new(m_label.mbc_str()); + + if (label.IsEmpty()) + m_widget = gtk_frame_new( (char*) NULL ); + else + m_widget = gtk_frame_new( m_label.mbc_str() ); m_parent->DoAddChild( this ); - + PostCreation(); SetLabel(label); - + + SetFont( parent->GetFont() ); + SetBackgroundColour( parent->GetBackgroundColour() ); SetForegroundColour( parent->GetForegroundColour() ); - SetFont( parent->GetFont() ); Show( TRUE ); @@ -80,4 +86,4 @@ void wxStaticBox::ApplyWidgetStyle() gtk_widget_set_style( m_widget, m_widgetStyle ); } -#endif +#endif // wxUSE_STATBOX