X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6ca41e57f48db4c1a2de7ae67c7e4b655d9809af..ce7208d49d5ce2ca1dc0b3b83f14f1d04f29c4bf:/src/gtk1/statbox.cpp diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp index fa7822024c..a2542e88e2 100644 --- a/src/gtk1/statbox.cpp +++ b/src/gtk1/statbox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: statbox.cpp +// Name: gtk/statbox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,65 +7,94 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "statbox.h" -#endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#if wxUSE_STATBOX #include "wx/statbox.h" +#include "wx/gtk1/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 ); + m_widget = gtk_frame_new(NULL); + SetLabel(label); - m_widget = gtk_frame_new(m_label); + m_parent->DoAddChild( this ); - m_parent->AddChild( this ); + PostCreation(size); - (m_parent->m_insertCallback)( m_parent, this ); - - 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; - SetLabel(label); - - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); + if ( style & (wxALIGN_RIGHT | wxALIGN_CENTER) ) // left alignment is default + gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.5); - Show( TRUE ); + return TRUE; +} + +void wxStaticBox::SetLabel( const wxString& label ) +{ + wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") ); - return TRUE; + GTKSetLabelForFrame(GTK_FRAME(m_widget), label); } -void wxStaticBox::SetLabel( const wxString &label ) +void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style) { - wxControl::SetLabel( label ); - GtkFrame *frame = GTK_FRAME( m_widget ); - gtk_frame_set_label( frame, GetLabel() ); + gtk_widget_modify_style(m_widget, style); } -void wxStaticBox::ApplyWidgetStyle() +// static +wxVisualAttributes +wxStaticBox::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + return GetDefaultAttributesFromGTKWidget(gtk_frame_new); } +#endif // wxUSE_STATBOX