1. wxChoice and wxComboBox support client data under MSW

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index f07862fa34c0e36f67f423f7f6cd898a96c87eaa..84fd9673ffdb062ef414a56c3d7b72173f728d18 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -2,10 +2,9 @@
 // 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
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -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,28 +26,53 @@ 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, 
-      const 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, 
-      const 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_needParent = TRUE;
+
+    PreCreation( parent, id, pos, size, style, name );

 
 

-  m_widget = gtk_frame_new( label );
+    m_isStaticBox = TRUE;
+    
+    m_widget = gtk_frame_new(m_label.mbc_str());
+
+    m_parent->DoAddChild( this );

   
   

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

   
   

-  Show( TRUE );
-    
-  return TRUE;
-};
+    SetBackgroundColour( parent->GetBackgroundColour() );
+    SetForegroundColour( parent->GetForegroundColour() );
+    SetFont( parent->GetFont() );
+
+    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