?lk

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 59282af9917f5ac38b44b0bb7f28d96e614ae901..b7697b9ce702068a45cf3ed87e1ee3ef500adf18 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
 //-----------------------------------------------------------------------------


@@ -27,41 +32,55 @@ wxStaticBox::wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {

-  Create( parent, id, label, pos, size, style, name );
+    Create( parent, id, label, pos, size, style, name );

 }
 
 bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
 }
 
 bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {

-  m_needParent = TRUE;
-
-  PreCreation( parent, id, pos, size, style, name );
-
-  m_widget = gtk_frame_new(m_label);
-
-  PostCreation();
+    m_needParent = TRUE;
+
+    if (!PreCreation( parent, pos, size ) ||
+        !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
+    {
+        wxFAIL_MSG( wxT("wxStaticBox creation failed") );
+       return FALSE;
+    }
+
+    m_isStaticBox = TRUE;
+    
+    if (label.IsEmpty())
+        m_widget = gtk_frame_new( (char*) NULL );
+    else
+        m_widget = gtk_frame_new( m_label.mbc_str() );
+
+    m_parent->DoAddChild( this );
+  
+    PostCreation();

 
 

-  SetLabel(label);
+    SetLabel(label);

   
   

-  SetBackgroundColour( parent->GetBackgroundColour() );
-  SetForegroundColour( parent->GetForegroundColour() );
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+    SetFont( parent->GetFont() );

 
 

-  Show( TRUE );
+    Show( TRUE );

 
 

-  return TRUE;
+    return TRUE;

 }
 
 void wxStaticBox::SetLabel( const wxString &label )
 {
 }
 
 void wxStaticBox::SetLabel( const wxString &label )
 {

-  wxControl::SetLabel( label );
-  GtkFrame *frame = GTK_FRAME( m_widget );
-  gtk_frame_set_label( frame, GetLabel() );
+    wxControl::SetLabel( label );
+    GtkFrame *frame = GTK_FRAME( m_widget );
+    gtk_frame_set_label( frame, GetLabel().mbc_str() );

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

-  SetWidgetStyle();
-  gtk_widget_set_style( m_widget, m_widgetStyle );
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );

 }
 
 }
 

+#endif