X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d522606d0a1dfd22bcdc1a386b3dca01fa985e3..14722c43c30918cd8fbba956b50ac3426d2fe339:/src/gtk/stattext.cpp?ds=sidebyside diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index 89594853ae..4bffc1fa04 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: stattext.cpp +// Name: src/gtk/stattext.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,32 +7,20 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "stattext.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #if wxUSE_STATTEXT #include "wx/stattext.h" -#include "wx/gtk/private.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" - -extern "C" -void wxgtk_window_size_request_callback(GtkWidget *widget, - GtkRequisition *requisition, - wxWindow *win); +#include +#include "wx/gtk/private.h" //----------------------------------------------------------------------------- // wxStaticText //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl) - wxStaticText::wxStaticText() { } @@ -45,7 +33,7 @@ wxStaticText::wxStaticText(wxWindow *parent, long style, const wxString &name) { - Create( parent, id, label, pos, size, style, name ); + Create( parent, id, label, pos, size, style, name ); } bool wxStaticText::Create(wxWindow *parent, @@ -56,149 +44,206 @@ bool wxStaticText::Create(wxWindow *parent, long style, const wxString &name ) { - m_needParent = TRUE; - if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { - wxFAIL_MSG( wxT("wxXX creation failed") ); - return FALSE; + 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( wxGTK_CONV( m_label ) ); - + m_widget = gtk_label_new(NULL); + g_object_ref(m_widget); + GtkJustification justify; - if ( style & wxALIGN_CENTER ) + if ( style & wxALIGN_CENTER_HORIZONTAL ) justify = GTK_JUSTIFY_CENTER; else if ( style & wxALIGN_RIGHT ) justify = GTK_JUSTIFY_RIGHT; - else // wxALIGN_LEFT is 0 + else justify = GTK_JUSTIFY_LEFT; + + if (GetLayoutDirection() == wxLayout_RightToLeft) + { + if (justify == GTK_JUSTIFY_RIGHT) + justify = GTK_JUSTIFY_LEFT; + else if (justify == GTK_JUSTIFY_LEFT) + justify = GTK_JUSTIFY_RIGHT; + } + gtk_label_set_justify(GTK_LABEL(m_widget), justify); + // set ellipsize mode + PangoEllipsizeMode ellipsizeMode = PANGO_ELLIPSIZE_NONE; + if ( style & wxST_ELLIPSIZE_START ) + ellipsizeMode = PANGO_ELLIPSIZE_START; + else if ( style & wxST_ELLIPSIZE_MIDDLE ) + ellipsizeMode = PANGO_ELLIPSIZE_MIDDLE; + else if ( style & wxST_ELLIPSIZE_END ) + ellipsizeMode = PANGO_ELLIPSIZE_END; + + gtk_label_set_ellipsize( GTK_LABEL(m_widget), ellipsizeMode ); + // GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2 static const float labelAlignments[] = { 0.0, 1.0, 0.5 }; gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0); - // do not move this call elsewhere - gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE ); + gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE ); + + SetLabel(label); m_parent->DoAddChild( this ); PostCreation(size); - - // the bug below only happens with GTK 2 -#ifdef __WXGTK20__ - if ( justify != GTK_JUSTIFY_LEFT ) - { - // if we let GTK call wxgtk_window_size_request_callback the label - // always shrinks to its minimal size for some reason and so no - // alignment except the default left doesn't work (in fact it does, - // but you don't see it) - gtk_signal_disconnect_by_func - ( - GTK_OBJECT(m_widget), - GTK_SIGNAL_FUNC(wxgtk_window_size_request_callback), - (gpointer) this - ); - } -#endif // __WXGTK20__ - return TRUE; + return true; } -wxString wxStaticText::GetLabel() const +void wxStaticText::GTKDoSetLabel(GTKLabelSetter setter, const wxString& label) { - GtkLabel *label = GTK_LABEL(m_widget); + wxCHECK_RET( m_widget != NULL, wxT("invalid static text") ); -#ifdef __WXGTK20__ - wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) ); -#else - wxString str = wxString( label->label ); -#endif + InvalidateBestSize(); - return wxString(str); + (this->*setter)(GTK_LABEL(m_widget), label); + + // adjust the label size to the new label unless disabled + if ( !HasFlag(wxST_NO_AUTORESIZE) && + !IsEllipsized() ) // if ellipsization is ON, then we don't want to get resized! + SetSize( GetBestSize() ); } -void wxStaticText::SetLabel( const wxString &label ) +void wxStaticText::SetLabel(const wxString& label) { - // Build the colorized version of the label - wxString colorlabel = label; - // If the color has been set, create a markup string to pass to the label setter - if (m_foregroundColour.Ok()) - { - colorlabel.Printf(_T("%s"), m_foregroundColour.Red(), - m_foregroundColour.Green(), m_foregroundColour.Blue(), label.c_str()); - } - - wxControl::SetLabel(label); + m_labelOrig = label; - // markup only allowed under GTK2 -#ifdef __WXGTK20__ - gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) ); -#else - gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); -#endif + GTKDoSetLabel(&wxStaticText::GTKSetLabelForLabel, label); +} - // adjust the label size to the new label unless disabled - if (!HasFlag(wxST_NO_AUTORESIZE)) - { - SetSize( GetBestSize() ); - SetSizeHints(GetSize()); - } +#if wxUSE_MARKUP + +bool wxStaticText::DoSetLabelMarkup(const wxString& markup) +{ + const wxString stripped = RemoveMarkup(markup); + if ( stripped.empty() && !markup.empty() ) + return false; + + m_labelOrig = stripped; + + GTKDoSetLabel(&wxStaticText::GTKSetLabelWithMarkupForLabel, markup); + + return true; } +#endif // wxUSE_MARKUP + bool wxStaticText::SetFont( const wxFont &font ) { + const bool wasUnderlined = GetFont().GetUnderlined(); + const bool wasStrickenThrough = GetFont().GetStrikethrough(); + bool ret = wxControl::SetFont(font); + const bool isUnderlined = GetFont().GetUnderlined(); + const bool isStrickenThrough = GetFont().GetStrikethrough(); + + if ( (isUnderlined != wasUnderlined) || + (isStrickenThrough != wasStrickenThrough) ) + { + // We need to update the Pango attributes used for the text. + if ( isUnderlined || isStrickenThrough ) + { + PangoAttrList* const attrs = pango_attr_list_new(); + if ( isUnderlined ) + { + PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); + a->start_index = 0; + a->end_index = (guint)-1; + pango_attr_list_insert(attrs, a); + } + + if ( isStrickenThrough ) + { + PangoAttribute *a = pango_attr_strikethrough_new( TRUE ); + a->start_index = 0; + a->end_index = (guint) -1; + pango_attr_list_insert(attrs, a); + } + + gtk_label_set_attributes(GTK_LABEL(m_widget), attrs); + pango_attr_list_unref(attrs); + } + else // No special attributes any more. + { + // Just remove any attributes we had set. + gtk_label_set_attributes(GTK_LABEL(m_widget), NULL); + } + + // The underlines for mnemonics are incompatible with using attributes + // so turn them off when setting underlined font. + gtk_label_set_use_underline(GTK_LABEL(m_widget), !isUnderlined); + } + // adjust the label size to the new label unless disabled if (!HasFlag(wxST_NO_AUTORESIZE)) { SetSize( GetBestSize() ); - SetSizeHints(GetSize()); } return ret; } -void wxStaticText::ApplyWidgetStyle() -{ - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); -} - wxSize wxStaticText::DoGetBestSize() const { // Do not return any arbitrary default value... wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") ); - // this invalidates the size request - gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE ); - gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE ); - - GtkRequisition req; - req.width = 2; - req.height = 2; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) - (m_widget, &req ); + // GetBestSize is supposed to return unwrapped size but calling + // gtk_label_set_line_wrap() from here is a bad idea as it queues another + // size request by calling gtk_widget_queue_resize() and we end up in + // infinite loop sometimes (notably when the control is in a toolbar) + // With GTK3 however, there is no simple alternative, and the sizing loop + // no longer seems to occur. +#ifdef __WXGTK3__ + gtk_label_set_line_wrap(GTK_LABEL(m_widget), false); +#else + GTK_LABEL(m_widget)->wrap = FALSE; +#endif + wxSize size = wxStaticTextBase::DoGetBestSize(); +#ifdef __WXGTK3__ + gtk_label_set_line_wrap(GTK_LABEL(m_widget), true); +#else + GTK_LABEL(m_widget)->wrap = TRUE; // restore old value +#endif - return wxSize(req.width, req.height); + // Adding 1 to width to workaround GTK sometimes wrapping the text needlessly + size.x++; + CacheBestSize(size); + return size; } -bool wxStaticText::SetForegroundColour(const wxColour& colour) +bool wxStaticText::GTKWidgetNeedsMnemonic() const { - // 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; } +void wxStaticText::GTKWidgetDoSetMnemonic(GtkWidget* w) +{ + gtk_label_set_mnemonic_widget(GTK_LABEL(m_widget), w); +} + + +// These functions should be used only when GTK+ < 2.6 by wxStaticTextBase::UpdateLabel() + +wxString wxStaticText::DoGetLabel() const +{ + GtkLabel *label = GTK_LABEL(m_widget); + return wxGTK_CONV_BACK( gtk_label_get_text( label ) ); +} + +void wxStaticText::DoSetLabel(const wxString& str) +{ + GTKSetLabelForLabel(GTK_LABEL(m_widget), str); +} + // static wxVisualAttributes wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))