- GtkRequisition req;
- (* GTK_WIDGET_CLASS( GTK_OBJECT(m_widget)->klass )->size_request ) (m_widget, &req );
-
- if (newSize.x == -1) newSize.x = req.width;
- if (newSize.y == -1) newSize.y = req.height;
-
- SetSize( newSize.x, newSize.y );
-
- m_parent->AddChild( this );
-
- (m_parent->m_insertCallback)( m_parent, this );
-
- PostCreation();
-
- SetBackgroundColour( parent->GetBackgroundColour() );
- SetForegroundColour( parent->GetForegroundColour() );
-
- Show( TRUE );
-
- return TRUE;
+#ifdef __WXGTK26__
+#ifndef __WXGTK3__
+ if (!gtk_check_version(2,6,0))
+#endif
+ {
+ // 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__
+
+ // 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 );
+
+ PostCreation(size);
+
+ return true;
+}
+
+void wxStaticText::GTKDoSetLabel(GTKLabelSetter setter, const wxString& label)
+{
+ wxCHECK_RET( m_widget != NULL, wxT("invalid static text") );
+
+ InvalidateBestSize();
+
+#ifndef __WXGTK3__
+ 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+.
+#endif
+ {
+ (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)
+{
+ 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;