X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58614078c466cffaf0e5d0369741706f130fb793..5c5ab9ebc3a7dd441c9e3b25cb3daf8f733c374f:/src/gtk1/statbox.cpp diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp index 59282af991..7afc40103d 100644 --- a/src/gtk1/statbox.cpp +++ b/src/gtk1/statbox.cpp @@ -13,6 +13,11 @@ #include "wx/statbox.h" +#if wxUSE_STATBOX + +#include "gdk/gdk.h" +#include "gtk/gtk.h" + //----------------------------------------------------------------------------- // wxStaticBox //----------------------------------------------------------------------------- @@ -27,41 +32,56 @@ wxStaticBox::wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - Create( parent, id, label, pos, size, style, name ); + Create( parent, id, label, pos, size, style, name ); } bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label, const wxPoint &pos, const wxSize &size, long style, const wxString &name ) { - m_needParent = TRUE; - - PreCreation( parent, id, pos, size, style, name ); - - m_widget = gtk_frame_new(m_label); - - PostCreation(); + m_needParent = TRUE; + + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) + { + wxFAIL_MSG( wxT("wxStaticBox creation failed") ); + return FALSE; + } + + m_isStaticBox = TRUE; + + 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); + SetLabel(label); - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); + SetFont( parent->GetFont() ); - Show( TRUE ); + SetBackgroundColour( parent->GetBackgroundColour() ); + SetForegroundColour( parent->GetForegroundColour() ); - return TRUE; + Show( TRUE ); + + return TRUE; } void wxStaticBox::SetLabel( const wxString &label ) { - wxControl::SetLabel( label ); - GtkFrame *frame = GTK_FRAME( m_widget ); - gtk_frame_set_label( frame, GetLabel() ); + wxControl::SetLabel( label ); + GtkFrame *frame = GTK_FRAME( m_widget ); + gtk_frame_set_label( frame, GetLabel().mbc_str() ); } void wxStaticBox::ApplyWidgetStyle() { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + SetWidgetStyle(); + gtk_widget_set_style( m_widget, m_widgetStyle ); } +#endif