X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ca41e57f48db4c1a2de7ae67c7e4b655d9809af..99006e446eb2156fe1c61e69926248901e399547:/src/gtk/statbox.cpp

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index fa7822024c..5777e99153 100644
--- 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,61 +11,93 @@
 #pragma implementation "statbox.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_STATBOX
+
 #include "wx/statbox.h"
+#include "wx/gtk/private.h"
+
+#include "gdk/gdk.h"
+#include "gtk/gtk.h"
 
 //-----------------------------------------------------------------------------
 // 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 );
+    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;
+    }
 
-  PreCreation( parent, id, pos, size, style, name );
+    wxControl::SetLabel(label);
 
-  m_widget = gtk_frame_new(m_label);
+    m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
 
-  m_parent->AddChild( this );
+    m_parent->DoAddChild( this );
 
-  (m_parent->m_insertCallback)( m_parent, this );
-  
-  PostCreation();
+    PostCreation();
 
-  SetLabel(label);
-  
-  SetBackgroundColour( parent->GetBackgroundColour() );
-  SetForegroundColour( parent->GetForegroundColour() );
+    InheritAttributes();
 
-  Show( TRUE );
+    // 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;
 
-  return TRUE;
+    if ( xalign )
+        gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0);
+
+    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() );
+    wxControl::SetLabel( label );
+
+    gtk_frame_set_label( GTK_FRAME( m_widget ),
+                         m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) );
 }
 
 void wxStaticBox::ApplyWidgetStyle()
 {
-  SetWidgetStyle();
-  gtk_widget_set_style( m_widget, m_widgetStyle );
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
 }
 
+#endif // wxUSE_STATBOX