no real changes

[wxWidgets.git] / src / gtk / statbox.cpp

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 0d4f598a2ae6457ad6288c9daef50af5a7a6fcbe..febadd9639c1bc6988afd1e31b2194ed49c258e2 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -11,10 +11,12 @@
 #pragma implementation "statbox.h"
 #endif
 
 #pragma implementation "statbox.h"
 #endif
 

-#include "wx/statbox.h"
+#include "wx/defs.h"

 
 #if wxUSE_STATBOX
 
 
 #if wxUSE_STATBOX
 

+#include "wx/statbox.h"
+

 #include "gdk/gdk.h"
 #include "gtk/gtk.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 ))
     {
     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_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 );
 
     m_parent->DoAddChild( this );

-  
+

     PostCreation();
 
     SetLabel(label);
     PostCreation();
 
     SetLabel(label);

-  
+
+    SetFont( parent->GetFont() );
+

     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

-    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 


@@ -80,4 +86,4 @@ void wxStaticBox::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 

-#endif
+#endif // wxUSE_STATBOX