wxMenuBarBase for MSW (untested)

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index a41325fb08a0f691ac39737bd6f9c78007862cba..d6a4a6852bbd139a6f24c8dcf4e0b7eae12521c8 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -13,6 +13,11 @@
 
 #include "wx/statbox.h"
 
 
 #include "wx/statbox.h"
 

+#if wxUSE_STATBOX
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+

 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------


@@ -36,15 +41,18 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
 {
     m_needParent = TRUE;
 
 {
     m_needParent = TRUE;
 

-    PreCreation( parent, id, pos, size, style, name );
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxStaticBox creation failed") );
+       return FALSE;
+    }

 
     m_isStaticBox = TRUE;
     
 
     m_isStaticBox = TRUE;
     

-    m_widget = gtk_frame_new(m_label);
+    m_widget = gtk_frame_new(m_label.mbc_str());

 
 

-    m_parent->AddChild( this );
-
-    (m_parent->m_insertCallback)( m_parent, this );
+    m_parent->DoAddChild( this );

   
     PostCreation();
 
   
     PostCreation();
 


@@ -52,6 +60,7 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );
   
     SetBackgroundColour( parent->GetBackgroundColour() );
     SetForegroundColour( parent->GetForegroundColour() );

+    SetFont( parent->GetFont() );

 
     Show( TRUE );
 
 
     Show( TRUE );
 


@@ -62,7 +71,7 @@ void wxStaticBox::SetLabel( const wxString &label )
 {
     wxControl::SetLabel( label );
     GtkFrame *frame = GTK_FRAME( m_widget );
 {
     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()
 }
 
 void wxStaticBox::ApplyWidgetStyle()


@@ -71,3 +80,4 @@ void wxStaticBox::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 

+#endif