X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f03fc89fff2d6e823e7d4d14fbe14822ad6777b1..e777924b358ae352f30881249f681ebb7a3ce089:/src/gtk/statbox.cpp diff --git a/src/gtk/statbox.cpp b/src/gtk/statbox.cpp index d1c978b2ef..fdc5f6eb5e 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,6 +11,10 @@ #pragma implementation "statbox.h" #endif +#include "wx/defs.h" + +#if wxUSE_STATBOX + #include "wx/statbox.h" #include "gdk/gdk.h" @@ -20,41 +24,67 @@ // 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; - PreCreation( parent, id, pos, size, style, name ); + if (!PreCreation( parent, pos, size ) || + !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) + { + wxFAIL_MSG( wxT("wxStaticBox creation failed") ); + return FALSE; + } m_isStaticBox = TRUE; - - m_widget = gtk_frame_new(m_label.mbc_str()); + + if (label.empty()) + m_widget = gtk_frame_new( (char*) NULL ); + else + m_widget = gtk_frame_new( 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 ); return TRUE; @@ -63,8 +93,8 @@ 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 ), GetLabel().mbc_str() ); } void wxStaticBox::ApplyWidgetStyle() @@ -72,3 +102,5 @@ void wxStaticBox::ApplyWidgetStyle() SetWidgetStyle(); gtk_widget_set_style( m_widget, m_widgetStyle ); } + +#endif // wxUSE_STATBOX