X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7545e13206beaed9058e0ccbc53c6ec9013c6cad..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/gtk1/statbox.cpp diff --git a/src/gtk1/statbox.cpp b/src/gtk1/statbox.cpp index d6c4bc496d..29b36eb167 100644 --- a/src/gtk1/statbox.cpp +++ b/src/gtk1/statbox.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: gtk/statbox.cpp +// Name: src/gtk1/statbox.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,17 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#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/gtk/private.h" +#include "wx/gtk1/private.h" #include "gdk/gdk.h" #include "gtk/gtk.h" @@ -26,8 +22,6 @@ // wxStaticBox //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticBox, wxControl) - wxStaticBox::wxStaticBox() { } @@ -60,9 +54,8 @@ bool wxStaticBox::Create( wxWindow *parent, return FALSE; } - wxControl::SetLabel(label); - - m_widget = gtk_frame_new(m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) ); + m_widget = gtk_frame_new(NULL); + SetLabel(label); m_parent->DoAddChild( this ); @@ -77,24 +70,22 @@ bool wxStaticBox::Create( wxWindow *parent, else // wxALIGN_LEFT xalign = 0.0; - if ( xalign ) - gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.0); + if ( style & (wxALIGN_RIGHT | wxALIGN_CENTER) ) // left alignment is default + gtk_frame_set_label_align(GTK_FRAME( m_widget ), xalign, 0.5); return TRUE; } -void wxStaticBox::SetLabel( const wxString &label ) +void wxStaticBox::SetLabel( const wxString& label ) { - wxControl::SetLabel( label ); + wxCHECK_RET( m_widget != NULL, wxT("invalid staticbox") ); - gtk_frame_set_label( GTK_FRAME( m_widget ), - m_label.empty() ? (char *)NULL : (const char*) wxGTK_CONV( m_label ) ); + GTKSetLabelForFrame(GTK_FRAME(m_widget), label); } void wxStaticBox::DoApplyWidgetStyle(GtkRcStyle *style) { gtk_widget_modify_style(m_widget, style); - gtk_widget_modify_style(GTK_FRAME(m_widget)->label_widget, style); } // static