Another attempts at getting dialog positions right

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 009f4a5865bed45e0b5bf438e2778bcdc485004f..c4d3cb49edafdc7a69dbe1c89ae06a6400f70f54 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
 /////////////////////////////////////////////////////////////////////////////
 


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

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

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


@@ -28,31 +30,47 @@ 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;
+    m_needParent = TRUE;
+
+    PreCreation( parent, id, pos, size, style, name );

 
 

-  PreCreation( parent, id, pos, size, style, name );
+    m_isStaticBox = TRUE;
+    
+    m_widget = gtk_frame_new(m_label.mbc_str());

 
 

-  m_widget = gtk_frame_new(m_label);
+    m_parent->AddChild( this );

 
 

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

 
 

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

   
   

-  Show( TRUE );
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+    SetFont( parent->GetFont() );
+
+    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()
+{
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );

 }
 }