X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ac6e0eb1547cfc47ca72e6a293e28ca0f93f2981..dee851ec9f34b3c251265189d3718c68b052c9cc:/src/gtk/stattext.cpp?ds=sidebyside diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index 4f90978241..5e9bac45b2 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -15,14 +15,6 @@ #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); - //----------------------------------------------------------------------------- // wxStaticText //----------------------------------------------------------------------------- @@ -41,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, @@ -52,35 +44,31 @@ 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("wxStaticText creation failed") ); - return FALSE; + return false; } - const wxString labelGTK = GTKConvertMnemonics(label); - m_label = label; - m_widget = gtk_label_new_with_mnemonic(wxGTK_CONV(labelGTK)); + m_widget = gtk_label_new(NULL); GtkJustification justify; if ( style & wxALIGN_CENTER ) 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) + { + if (justify == GTK_JUSTIFY_RIGHT) justify = GTK_JUSTIFY_LEFT; - if (justify == GTK_JUSTIFY_LEFT) + else if (justify == GTK_JUSTIFY_LEFT) justify = GTK_JUSTIFY_RIGHT; } - + gtk_label_set_justify(GTK_LABEL(m_widget), justify); // GTK_JUSTIFY_LEFT is 0, RIGHT 1 and CENTER 2 @@ -89,41 +77,61 @@ bool wxStaticText::Create(wxWindow *parent, gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE ); - m_parent->DoAddChild( this ); - - PostCreation(size); - - // the bug below only happens with GTK 2 - if ( justify != GTK_JUSTIFY_LEFT ) +#ifdef __WXGTK26__ + if (!gtk_check_version(2,6,0)) { - // 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) - g_signal_handlers_disconnect_by_func (m_widget, - (gpointer) wxgtk_window_size_request_callback, - this); + // 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__ - return TRUE; -} + SetLabel(label); -wxString wxStaticText::GetLabel() const -{ - GtkLabel *label = GTK_LABEL(m_widget); - wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) ); + m_parent->DoAddChild( this ); + + PostCreation(size); - return wxString(str); + return true; } -void wxStaticText::SetLabel( const wxString &label ) +void wxStaticText::SetLabel( const wxString& str ) { wxCHECK_RET( m_widget != NULL, wxT("invalid static text") ); - GTKSetLabelForLabel(GTK_LABEL(m_widget), label); + // 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()) + { + // 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(); + } + + 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) ) + if ( !HasFlag(wxST_NO_AUTORESIZE) && + !IsEllipsized() ) // if ellipsize is ON, then we don't want to get resized! SetSize( GetBestSize() ); } @@ -150,7 +158,7 @@ bool wxStaticText::SetFont( const wxFont &font ) PangoAttrList *attrs = pango_attr_list_new(); PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE); a->start_index = 0; - a->end_index = -1; + 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); @@ -160,7 +168,6 @@ bool wxStaticText::SetFont( const wxFont &font ) // adjust the label size to the new label unless disabled if (!HasFlag(wxST_NO_AUTORESIZE)) { - InvalidateBestSize(); SetSize( GetBestSize() ); } return ret; @@ -170,7 +177,14 @@ void wxStaticText::DoSetSize(int x, int y, int width, int height, int sizeFlags ) { - wxControl::DoSetSize( x, y, width, height, 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 @@ -178,28 +192,20 @@ wxSize wxStaticText::DoGetBestSize() const // Do not return any arbitrary default value... wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") ); - // GetBestSize is supposed to return unwrapped size - gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE ); + // 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) + GTK_LABEL(m_widget)->wrap = FALSE; - GtkRequisition req; - req.width = -1; - req.height = -1; - (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) - (m_widget, &req ); + wxSize size = wxStaticTextBase::DoGetBestSize(); - gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE ); + GTK_LABEL(m_widget)->wrap = TRUE; // restore old value // Adding 1 to width to workaround GTK sometimes wrapping the text needlessly - return wxSize (req.width+1, req.height); -} - -bool wxStaticText::SetForegroundColour(const wxColour& colour) -{ - // 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; + size.x++; + CacheBestSize(size); + return size; } bool wxStaticText::GTKWidgetNeedsMnemonic() const @@ -212,6 +218,20 @@ 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))