X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ecc4d808e6100aefda0f4097beeefeeab475ddd..88594d02eb59a55ac85d3210a49d02918124617b:/src/gtk/statbox.cpp?ds=sidebyside

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index a41325fb08..febadd9639 100644
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -11,8 +11,15 @@
 #pragma implementation "statbox.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_STATBOX
+
 #include "wx/statbox.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
@@ -36,20 +43,28 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
 {
     m_needParent = TRUE;
 
-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxStaticBox creation failed") );
+        return FALSE;
+    }
 
     m_isStaticBox = TRUE;
-    
-    m_widget = gtk_frame_new(m_label);
 
-    m_parent->AddChild( this );
+    if (label.IsEmpty())
+        m_widget = gtk_frame_new( (char*) NULL );
+    else
+        m_widget = gtk_frame_new( m_label.mbc_str() );
+
+    m_parent->DoAddChild( this );
 
-    (m_parent->m_insertCallback)( m_parent, this );
-  
     PostCreation();
 
     SetLabel(label);
-  
+
+    SetFont( parent->GetFont() );
+
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
 
@@ -62,7 +77,7 @@ void wxStaticBox::SetLabel( const wxString &label )
 {
     wxControl::SetLabel( label );
     GtkFrame *frame = GTK_FRAME( m_widget );
-    gtk_frame_set_label( frame, GetLabel() );
+    gtk_frame_set_label( frame, GetLabel().mbc_str() );
 }
 
 void wxStaticBox::ApplyWidgetStyle()
@@ -71,3 +86,4 @@ void wxStaticBox::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
+#endif // wxUSE_STATBOX