X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dcaf11a7b5189be78e52e1412febd7689a959f8..e623926d636cf2ff8a39ec0b773028779189cb92:/src/gtk1/statbox.cpp?ds=sidebyside diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp index d39006cda7..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