updated xml project file with latest changes (spinctrl, display, msgout, ...)

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index d39006cda7c1591074c0fbf1d62c72cac8aa3079..3884e299b71b2f562c16932110f229e3c5207081 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        statbox.cpp
+// Name:        gtk/statbox.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -11,10 +11,12 @@
 #pragma implementation "statbox.h"
 #endif
 
-#include "wx/statbox.h"
+#include "wx/defs.h"
 
 #if wxUSE_STATBOX
 
+#include "wx/statbox.h"
+
 #include "gdk/gdk.h"
 #include "gtk/gtk.h"
 
@@ -22,45 +24,61 @@
 // wxStaticBox
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticBox,wxControl)
+IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl)
 
-wxStaticBox::wxStaticBox(void)
+wxStaticBox::wxStaticBox()
 {
 }
 
-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 );
 }
 
-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;
 
     if (!PreCreation( parent, pos, size ) ||
         !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name ))
     {
-        wxFAIL_MSG( _T("wxStaticBox creation failed") );
-       return FALSE;
+        wxFAIL_MSG( wxT("wxStaticBox creation failed") );
+        return FALSE;
     }
 
-    m_isStaticBox = TRUE;
-    
-    m_widget = gtk_frame_new(m_label.mbc_str());
+    wxControl::SetLabel(label);
+
+    m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : m_label.mbc_str());
 
     m_parent->DoAddChild( this );
-  
+
     PostCreation();
 
-    SetLabel(label);
-  
-    SetBackgroundColour( parent->GetBackgroundColour() );
-    SetForegroundColour( parent->GetForegroundColour() );
-    SetFont( parent->GetFont() );
+    InheritAttributes();
+
+    // need to set non default alignment?
+    gfloat xalign;
+    if ( style & wxALIGN_CENTER )
+        xalign = 0.5;
+    else if ( style & wxALIGN_RIGHT )
+        xalign = 1.0;
+    else // wxALIGN_LEFT
+        xalign = 0.0;
+
+    if ( xalign )
+        gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0);
 
     Show( TRUE );
 
@@ -70,8 +88,9 @@ bool wxStaticBox::Create( wxWindow *parent, wxWindowID id, const wxString &label
 void wxStaticBox::SetLabel( const wxString &label )
 {
     wxControl::SetLabel( label );
-    GtkFrame *frame = GTK_FRAME( m_widget );
-    gtk_frame_set_label( frame, GetLabel().mbc_str() );
+
+    gtk_frame_set_label( GTK_FRAME( m_widget ),
+                         m_label.empty() ? (char *)NULL : m_label.mbc_str() );
 }
 
 void wxStaticBox::ApplyWidgetStyle()
@@ -80,4 +99,4 @@ void wxStaticBox::ApplyWidgetStyle()
     gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
-#endif
+#endif // wxUSE_STATBOX