X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88684daa70085522a07302c4cb1ab8346a8102ea..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/gtk/stattext.cpp diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index e0d277d91b..d30ee64a2e 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$ @@ -13,14 +13,14 @@ #if wxUSE_STATTEXT #include "wx/stattext.h" + +#include #include "wx/gtk/private.h" //----------------------------------------------------------------------------- // wxStaticText //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl) - wxStaticText::wxStaticText() { } @@ -52,6 +52,7 @@ bool wxStaticText::Create(wxWindow *parent, } m_widget = gtk_label_new(NULL); + g_object_ref(m_widget); GtkJustification justify; if ( style & wxALIGN_CENTER_HORIZONTAL ) @@ -71,14 +72,10 @@ bool wxStaticText::Create(wxWindow *parent, gtk_label_set_justify(GTK_LABEL(m_widget), justify); - // 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); - - gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE ); - #ifdef __WXGTK26__ +#ifndef __WXGTK3__ if (!gtk_check_version(2,6,0)) +#endif { // set ellipsize mode PangoEllipsizeMode ellipsizeMode = PANGO_ELLIPSIZE_NONE; @@ -93,6 +90,12 @@ bool wxStaticText::Create(wxWindow *parent, } #endif // __WXGTK26__ + // 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); + + gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE ); + SetLabel(label); m_parent->DoAddChild( this ); @@ -102,67 +105,102 @@ bool wxStaticText::Create(wxWindow *parent, return true; } -void wxStaticText::SetLabel( const wxString& str ) +void wxStaticText::GTKDoSetLabel(GTKLabelSetter setter, const wxString& label) { wxCHECK_RET( m_widget != NULL, wxT("invalid static text") ); - // save the label inside m_labelOrig in case user calls GetLabel() later - m_labelOrig = str; - InvalidateBestSize(); - wxString label(str); - if (gtk_check_version(2,6,0) && - IsEllipsized()) +#ifndef __WXGTK3__ + if (gtk_check_version(2,6,0) && IsEllipsized()) { - // GTK+ < 2.6 does not support ellipsization: - // since we need to use our generic code for ellipsization (which does not - // behaves well in conjunction with markup; i.e. it may break the markup - // validity erasing portions of the string), we also need to strip out - // the markup (if present) from the label. - - label = GetEllipsizedLabelWithoutMarkup(); + // GTK+ < 2.6 does not support ellipsization so we need to do it + // manually and as our ellipsization code doesn't deal with markup, we + // have no choice but to ignore it in this case and always use plain + // text. + GTKSetLabelForLabel(GTK_LABEL(m_widget), GetEllipsizedLabel()); + } + else // Ellipsization not needed or supported by GTK+. +#endif + { + (this->*setter)(GTK_LABEL(m_widget), label); } - - if ( HasFlag(wxST_MARKUP) ) - GTKSetLabelWithMarkupForLabel(GTK_LABEL(m_widget), label); - else - GTKSetLabelForLabel(GTK_LABEL(m_widget), label); // adjust the label size to the new label unless disabled - if ( !HasFlag(wxST_NO_AUTORESIZE) && - !IsEllipsized() ) // if ellipsize is ON, then we don't want to get resized! + 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) +{ + m_labelOrig = label; + + GTKDoSetLabel(&wxStaticText::GTKSetLabelForLabel, label); +} + +#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); - if ( font.GetUnderlined() != wasUnderlined ) - { - // the underlines for mnemonics are incompatible with using attributes - // so turn them off when setting underlined font and restore them when - // unsetting it - gtk_label_set_use_underline(GTK_LABEL(m_widget), wasUnderlined); + const bool isUnderlined = GetFont().GetUnderlined(); + const bool isStrickenThrough = GetFont().GetStrikethrough(); - if ( wasUnderlined ) - { - // it's not underlined any more, remove the attributes we set - gtk_label_set_attributes(GTK_LABEL(m_widget), NULL); - } - else // the text is underlined now + if ( (isUnderlined != wasUnderlined) || + (isStrickenThrough != wasStrickenThrough) ) + { + // We need to update the Pango attributes used for the text. + if ( isUnderlined || isStrickenThrough ) { - PangoAttrList *attrs = pango_attr_list_new(); - PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); - a->start_index = 0; - a->end_index = (guint)-1; - pango_attr_list_insert(attrs, a); + 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 @@ -174,17 +212,19 @@ bool wxStaticText::SetFont( const wxFont &font ) } void wxStaticText::DoSetSize(int x, int y, - int width, int height, - int sizeFlags ) + int width, int height, + int sizeFlags ) { wxStaticTextBase::DoSetSize(x, y, width, height, sizeFlags); +#ifndef __WXGTK3__ if (gtk_check_version(2,6,0)) { // GTK+ < 2.6 does not support ellipsization - we need to run our // generic code (actually it will be run only if IsEllipsized() == true) UpdateLabel(); } +#endif } wxSize wxStaticText::DoGetBestSize() const @@ -196,11 +236,19 @@ wxSize wxStaticText::DoGetBestSize() const // 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 // Adding 1 to width to workaround GTK sometimes wrapping the text needlessly size.x++;