This code is now shared with wxX11: remove.

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 3884e299b71b2f562c16932110f229e3c5207081..879e2bc579d1ceaad9741358e4411e8e86f277ff 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -7,15 +7,17 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #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"
+#include "wx/gtk/private.h"
 
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
@@ -60,13 +62,11 @@ bool wxStaticBox::Create( wxWindow *parent,
 
     wxControl::SetLabel(label);
 
-    m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : 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();
-
-    InheritAttributes();
+    PostCreation(size);
 
     // need to set non default alignment?
     gfloat xalign;
@@ -80,8 +80,6 @@ bool wxStaticBox::Create( wxWindow *parent,
     if ( xalign )
         gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0);
 
-    Show( TRUE );
-
     return TRUE;
 }
 
@@ -90,7 +88,7 @@ void wxStaticBox::SetLabel( const wxString &label )
     wxControl::SetLabel( label );
 
     gtk_frame_set_label( GTK_FRAME( m_widget ),
-                         m_label.empty() ? (char *)NULL : m_label.mbc_str() );
+                         m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
 }
 
 void wxStaticBox::ApplyWidgetStyle()
@@ -99,4 +97,11 @@ void wxStaticBox::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
+// static
+wxVisualAttributes
+wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_frame_new);
+}
+
 #endif // wxUSE_STATBOX