Dialog Editor corrections for latest wxWin changes; removed wxProp files

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 4e768e3b12354bf18e8c2c7618955f3e0a983155..fa7822024ce09be3134f12ba527c3f9035556fb9 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -22,14 +21,14 @@ 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 )
 {
   Create( parent, id, label, pos, size, style, 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 );

-};
+}

 
 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,


@@ -39,12 +38,34 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
 
   PreCreation( parent, id, pos, size, style, name );
 
 
   PreCreation( parent, id, pos, size, style, name );
 

-  SetLabel(m_label);

   m_widget = gtk_frame_new(m_label);
 
   m_widget = gtk_frame_new(m_label);
 

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

   PostCreation();
 
   PostCreation();
 

+  SetLabel(label);
+  
+  SetBackgroundColour( parent->GetBackgroundColour() );
+  SetForegroundColour( parent->GetForegroundColour() );
+

   Show( TRUE );
 
   return TRUE;
   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() );
+}
+
+void wxStaticBox::ApplyWidgetStyle()
+{
+  SetWidgetStyle();
+  gtk_widget_set_style( m_widget, m_widgetStyle );
+}
+