Nicer looking OS/2 Statusbar

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

diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp
index 3f6abe319888d0f7af019ba66bd7057a9b67492f..22c946136c3f19457f3f844811d774dcb219e9c5 100644 (file)
--- a/src/gtk/statbox.cpp
+++ b/src/gtk/statbox.cpp
@@ -1,10 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        statbox.cpp
+// Name:        gtk/statbox.cpp

 // Purpose:
 // Author:      Robert Roebling
 // 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -12,39 +11,92 @@
 #pragma implementation "statbox.h"
 #endif
 
 #pragma implementation "statbox.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_STATBOX
+

 #include "wx/statbox.h"
 
 #include "wx/statbox.h"
 

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

 //-----------------------------------------------------------------------------
 // wxStaticBox
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // 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;
+    }
+
+    m_widget = gtk_frame_new(label.empty() ? (char *)NULL : label.mbc_str());
+
+    m_parent->DoAddChild( this );
+
+    PostCreation();

 
 

-  PreCreation( parent, id, pos, size, style, name );
+    SetLabel(label);

 
 

-  SetLabel(label);
-  m_widget = gtk_frame_new(m_label);
+    InheritAttributes();

 
 

-  PostCreation();
+    // 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;

 
 

-  Show( 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 );
+
+    gtk_frame_set_label( GTK_FRAME( m_widget ),
+                         label.empty() ? (char *)NULL : label.mbc_str() );
+}
+
+void wxStaticBox::ApplyWidgetStyle()
+{
+    SetWidgetStyle();
+    gtk_widget_set_style( m_widget, m_widgetStyle );
+}

 
 

-  return TRUE;
-};
+#endif // wxUSE_STATBOX