/////////////////////////////////////////////////////////////////////////////
-// Name: stattext.cpp
+// Name: src/gtk/stattext.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
#if wxUSE_STATTEXT
#include "wx/stattext.h"
+
+#include <gtk/gtk.h>
#include "wx/gtk/private.h"
//-----------------------------------------------------------------------------
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 };
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) &&
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
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...
// 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++;
projects / wxWidgets.git / blobdiff