X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f68586e51b20dccee3fd5645aeaca7cc8ff298c2..c00fed0ef4d70c9b45d9b8405f636d30eadb7ea6:/src/gtk1/stattext.cpp?ds=inline diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index b89853149c..e1f4fb53e1 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -7,16 +7,22 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#ifdef __GNUG__ - #pragma implementation "stattext.h" -#endif +#if wxUSE_STATTEXT #include "wx/stattext.h" +#include "wx/gtk1/private.h" #include "gdk/gdk.h" #include "gtk/gtk.h" +extern "C" +void wxgtk_window_size_request_callback(GtkWidget *widget, + GtkRequisition *requisition, + wxWindow *win); + //----------------------------------------------------------------------------- // wxStaticText //----------------------------------------------------------------------------- @@ -51,20 +57,12 @@ bool wxStaticText::Create(wxWindow *parent, if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { - wxFAIL_MSG( wxT("wxXX creation failed") ); + wxFAIL_MSG( wxT("wxStaticText creation failed") ); return FALSE; } - // notice that we call the base class version which will just remove the - // '&' characters from the string, but not set the label's text to it - // because the label is not yet created and because SetLabel() has a side - // effect of changing the control size which might not be desirable - wxControl::SetLabel(label); - m_widget = gtk_label_new( m_label.mbc_str() ); - - gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE ); - - SetFont( parent->GetFont() ); + m_label = label; + m_widget = gtk_label_new( wxGTK_CONV( GTKRemoveMnemonics(label)) ); GtkJustification justify; if ( style & wxALIGN_CENTER ) @@ -79,42 +77,90 @@ bool wxStaticText::Create(wxWindow *parent, static const float labelAlignments[] = { 0.0, 1.0, 0.5 }; gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0); - SetSizeOrDefault( size ); + gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE ); m_parent->DoAddChild( this ); - PostCreation(); - - SetBackgroundColour( parent->GetBackgroundColour() ); - SetForegroundColour( parent->GetForegroundColour() ); - Show( TRUE ); + PostCreation(size); return TRUE; } wxString wxStaticText::GetLabel() const { - char *str = (char *) NULL; - gtk_label_get( GTK_LABEL(m_widget), &str ); - + GtkLabel *label = GTK_LABEL(m_widget); + wxString str = wxString( label->label ); return wxString(str); } void wxStaticText::SetLabel( const wxString &label ) { - wxControl::SetLabel(label); + wxCHECK_RET( m_widget != NULL, wxT("invalid static text") ); + + GTKSetLabelForLabel(GTK_LABEL(m_widget), label); + + // adjust the label size to the new label unless disabled + if (!HasFlag(wxST_NO_AUTORESIZE)) + SetSize( GetBestSize() ); +} - gtk_label_set( GTK_LABEL(m_widget), m_label.mbc_str() ); +bool wxStaticText::SetFont( const wxFont &font ) +{ + bool ret = wxControl::SetFont(font); // adjust the label size to the new label unless disabled - if ( !(GetWindowStyle() & wxST_NO_AUTORESIZE) ) + if (!HasFlag(wxST_NO_AUTORESIZE)) { + InvalidateBestSize(); SetSize( GetBestSize() ); } + return ret; } -void wxStaticText::ApplyWidgetStyle() +void wxStaticText::DoSetSize(int x, int y, + int width, int height, + int sizeFlags ) { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + wxControl::DoSetSize( x, y, width, height, sizeFlags ); } + +wxSize wxStaticText::DoGetBestSize() const +{ + // Do not return any arbitrary default value... + wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") ); + + // This resets the internal GTK1 size calculation, which + // otherwise would be cashed (incorrectly) + gtk_label_set_pattern( GTK_LABEL(m_widget), NULL ); + + // GetBestSize is supposed to return unwrapped size + gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE ); + + GtkRequisition req; + req.width = -1; + req.height = -1; + (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) + (m_widget, &req ); + + gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE ); + + return wxSize (req.width, req.height); +} + +bool wxStaticText::SetForegroundColour(const wxColour& colour) +{ + // First, we call the base class member + wxControl::SetForegroundColour(colour); + // Then, to force the color change, we set the label with the current label + SetLabel(GetLabel()); + return true; +} + +// static +wxVisualAttributes +wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant)) +{ + return GetDefaultAttributesFromGTKWidget(gtk_label_new); +} + +#endif // wxUSE_STATTEXT