Removed redundant m_displayed member var from wxGrid

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

diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index d39006cda7c1591074c0fbf1d62c72cac8aa3079..7afc40103d6317e3272bbc4dcdcc6e04153a8478 100644 (file)
--- a/src/gtk1/statbox.cpp
+++ b/src/gtk1/statbox.cpp
@@ -44,13 +44,16 @@ 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 );
   


@@ -58,9 +61,10 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
 
     SetLabel(label);
   
 
     SetLabel(label);
   

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

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

-    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );