1. wxTextControl::SetFont() does something (good or bad - for you to judge)

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

diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index e5239cc9243669fe0d94f0245bc88a6528daf6bf..84fd9673ffdb062ef414a56c3d7b72173f728d18 100644 (file)
--- a/src/gtk1/statbox.cpp
+++ b/src/gtk1/statbox.cpp
@@ -13,6 +13,8 @@
 
 #include "wx/statbox.h"
 
+#if wxUSE_STATBOX
+
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
@@ -43,11 +45,9 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
 
     m_isStaticBox = TRUE;
     
-    m_widget = gtk_frame_new(m_label);
-
-    m_parent->AddChild( this );
+    m_widget = gtk_frame_new(m_label.mbc_str());
 
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );
   
     PostCreation();
 
@@ -55,6 +55,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
+    SetFont( parent->GetFont() );
 
     Show( TRUE );
 
@@ -65,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()
@@ -74,3 +75,4 @@ void wxStaticBox::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
+#endif