Constructor should survive getting passed a null pointer for conversion.

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index a41325fb08a0f691ac39737bd6f9c78007862cba..c4d3cb49edafdc7a69dbe1c89ae06a6400f70f54 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -13,6 +13,9 @@
 
 #include "wx/statbox.h"
 
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
@@ -40,7 +43,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
 
     m_isStaticBox = TRUE;
     
-    m_widget = gtk_frame_new(m_label);
+    m_widget = gtk_frame_new(m_label.mbc_str());
 
     m_parent->AddChild( this );
 
@@ -52,6 +55,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
+    SetFont( parent->GetFont() );
 
     Show( TRUE );
 
@@ -62,7 +66,7 @@ void wxStaticBox::SetLabel( const wxString &label )
 {
     wxControl::SetLabel( label );
     GtkFrame *frame = GTK_FRAME( m_widget );
-    gtk_frame_set_label( frame, GetLabel() );
+    gtk_frame_set_label( frame, GetLabel().mbc_str() );
 }
 
 void wxStaticBox::ApplyWidgetStyle()
@@ -70,4 +74,3 @@ void wxStaticBox::ApplyWidgetStyle()
     SetWidgetStyle();
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
-