Corrected Clone return type

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 319fe3ac93791f57ffe04011aca7ea0796a7afa3..7afc40103d6317e3272bbc4dcdcc6e04153a8478 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -2,10 +2,9 @@
 // Name:        statbox.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -14,6 +13,11 @@
 
 #include "wx/statbox.h"
 
+#if wxUSE_STATBOX
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
+
 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
@@ -22,28 +26,62 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBox,wxControl)
 
 wxStaticBox::wxStaticBox(void)
 {
-};
+}
 
-wxStaticBox::wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label, 
-      const wxPoint &pos, const wxSize &size, 
+wxStaticBox::wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label,
+      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, 
+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_needParent = TRUE;
 
-  m_widget = gtk_frame_new( label );
+    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();
+    PostCreation();
+
+    SetLabel(label);
   
-  Show( TRUE );
-    
-  return TRUE;
-};
+    SetFont( parent->GetFont() );
+
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+
+    Show( TRUE );
+
+    return TRUE;
+}
+
+void wxStaticBox::SetLabel( const wxString &label )
+{
+    wxControl::SetLabel( label );
+    GtkFrame *frame = GTK_FRAME( m_widget );
+    gtk_frame_set_label( frame, GetLabel().mbc_str() );
+}
+
+void wxStaticBox::ApplyWidgetStyle()
+{
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+
+#endif