A little clarification

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index fdc5f6eb5e50911d2249b35679c0d24f13616e09..6610fad49d89a8592efdb917baa04923f00a7502 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -7,15 +7,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "statbox.h"
 #endif
 
 #pragma implementation "statbox.h"
 #endif
 

-#include "wx/defs.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 #if wxUSE_STATBOX
 
 #include "wx/statbox.h"
 
 #if wxUSE_STATBOX
 
 #include "wx/statbox.h"

+#include "wx/gtk/private.h"

 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"


@@ -58,19 +60,14 @@ bool wxStaticBox::Create( wxWindow *parent,
         return FALSE;
     }
 
         return FALSE;
     }
 

-    m_isStaticBox = TRUE;
+    wxControl::SetLabel(label);

 
 

-    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(m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );

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

-    SetLabel(label);
-

     InheritAttributes();
 
     // need to set non default alignment?
     InheritAttributes();
 
     // need to set non default alignment?


@@ -84,7 +81,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 +91,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 ),
+                         m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );

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