Corrected frame.cpp to recognise wxNO_BORDER properly

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

diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp
index 3f6abe319888d0f7af019ba66bd7057a9b67492f..7afc40103d6317e3272bbc4dcdcc6e04153a8478 100644 (file)
--- a/src/gtk1/statbox.cpp
+++ b/src/gtk1/statbox.cpp
@@ -2,9 +2,8 @@
 // Name:        statbox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        statbox.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -14,6 +13,11 @@
 
 #include "wx/statbox.h"
 
 
 #include "wx/statbox.h"
 

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

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


@@ -22,29 +26,62 @@ IMPLEMENT_DYNAMIC_CLASS(wxStaticBox,wxControl)
 
 wxStaticBox::wxStaticBox(void)
 {
 
 wxStaticBox::wxStaticBox(void)
 {

-};
+}

 
 wxStaticBox::wxStaticBox( wxWindow *parent, wxWindowID id, const wxString &label,
       const wxPoint &pos, const wxSize &size,
       long style, const wxString &name )
 {
 
 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,
       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;
+    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();

 
 

-  PreCreation( parent, id, pos, size, style, name );
+    SetLabel(label);
+  
+    SetFont( parent->GetFont() );

 
 

-  SetLabel(label);
-  m_widget = gtk_frame_new(m_label);
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );

 
 

-  PostCreation();
+    Show( TRUE );

 
 

-  Show( TRUE );
+    return 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