Fix text placement in statusbar

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index fdc5f6eb5e50911d2249b35679c0d24f13616e09..22c946136c3f19457f3f844811d774dcb219e9c5 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -58,12 +58,7 @@ bool wxStaticBox::Create( wxWindow *parent,
         return FALSE;
     }
 
         return FALSE;
     }
 

-    m_isStaticBox = TRUE;
-
-    if (label.empty())
-        m_widget = gtk_frame_new( (char*) NULL );
-    else
-        m_widget = gtk_frame_new( m_label.mbc_str() );
+    m_widget = gtk_frame_new(label.empty() ? (char *)NULL : label.mbc_str());

 
     m_parent->DoAddChild( this );
 
 
     m_parent->DoAddChild( this );
 


@@ -84,7 +79,7 @@ bool wxStaticBox::Create( wxWindow *parent,
 
     if ( xalign )
         gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0);
 
     if ( xalign )
         gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0);

-        
+

     Show( TRUE );
 
     return TRUE;
     Show( TRUE );
 
     return TRUE;


@@ -94,7 +89,8 @@ void wxStaticBox::SetLabel( const wxString &label )
 {
     wxControl::SetLabel( label );
 
 {
     wxControl::SetLabel( label );
 

-    gtk_frame_set_label( GTK_FRAME( m_widget ), GetLabel().mbc_str() );
+    gtk_frame_set_label( GTK_FRAME( m_widget ),
+                         label.empty() ? (char *)NULL : label.mbc_str() );

 }
 
 void wxStaticBox::ApplyWidgetStyle()
 }
 
 void wxStaticBox::ApplyWidgetStyle()