X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c7a49742ec6b4effe012dc7204db307e1267bf6a..bb996f289574defb0ae4339ae8e46ff3cf6fa54c:/src/gtk/stattext.cpp?ds=sidebyside diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index 2461821714..4bffc1fa04 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -13,6 +13,8 @@ #if wxUSE_STATTEXT #include "wx/stattext.h" + +#include #include "wx/gtk/private.h" //----------------------------------------------------------------------------- @@ -70,21 +72,16 @@ bool wxStaticText::Create(wxWindow *parent, gtk_label_set_justify(GTK_LABEL(m_widget), justify); -#ifdef __WXGTK26__ - if (!gtk_check_version(2,6,0)) - { - // 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 ); - } -#endif // __WXGTK26__ + // 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 }; @@ -107,18 +104,7 @@ void wxStaticText::GTKDoSetLabel(GTKLabelSetter setter, const wxString& label) InvalidateBestSize(); - if (gtk_check_version(2,6,0) && IsEllipsized()) - { - // 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+. - { - (this->*setter)(GTK_LABEL(m_widget), label); - } + (this->*setter)(GTK_LABEL(m_widget), label); // adjust the label size to the new label unless disabled if ( !HasFlag(wxST_NO_AUTORESIZE) && @@ -205,20 +191,6 @@ bool wxStaticText::SetFont( const wxFont &font ) return ret; } -void wxStaticText::DoSetSize(int x, int y, - int width, int height, - int sizeFlags ) -{ - wxStaticTextBase::DoSetSize(x, y, width, height, sizeFlags); - - 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(); - } -} - wxSize wxStaticText::DoGetBestSize() const { // Do not return any arbitrary default value... @@ -228,11 +200,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++;