X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f15c5febf5b9ae6ba7a8d3793fa0a187fac1980..bf7945cef10c0844a32e95695c544d829da9293a:/src/gtk1/statbox.cpp

diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index c4d3cb49ed..7afc40103d 100644
--- a/src/gtk1/statbox.cpp
+++ b/src/gtk1/statbox.cpp
@@ -13,6 +13,8 @@
 
 #include "wx/statbox.h"
 
+#if wxUSE_STATBOX
+
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
@@ -39,23 +41,30 @@ 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.mbc_str());
-
-    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->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );
   
     PostCreation();
 
     SetLabel(label);
   
+    SetFont( parent->GetFont() );
+
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
 
     Show( TRUE );
 
@@ -74,3 +83,5 @@ void wxStaticBox::ApplyWidgetStyle()
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
+
+#endif