X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..198be845897a79ba350ae7f93db536ddb2eccfb2:/src/gtk/stattext.cpp diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index bfca9d9409..a10e98f85b 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -7,10 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "stattext.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -45,7 +41,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, @@ -56,22 +52,15 @@ 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("wxXX creation failed") ); - return FALSE; + wxFAIL_MSG( wxT("wxStaticText creation failed") ); + return false; } - // notice that we call the base class version which will just remove the - // '&' characters from the string, but not set the label's text to it - // because the label is not yet created and because SetLabel() has a side - // effect of changing the control size which might not be desirable - wxControl::SetLabel(label); - m_widget = gtk_label_new( wxGTK_CONV( m_label ) ); - + m_widget = gtk_label_new(NULL); + GtkJustification justify; if ( style & wxALIGN_CENTER ) justify = GTK_JUSTIFY_CENTER; @@ -79,105 +68,149 @@ bool wxStaticText::Create(wxWindow *parent, justify = GTK_JUSTIFY_RIGHT; else // wxALIGN_LEFT is 0 justify = GTK_JUSTIFY_LEFT; + + if (GetLayoutDirection() == wxLayout_RightToLeft) + { + if (justify == GTK_JUSTIFY_RIGHT) + justify = GTK_JUSTIFY_LEFT; + 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 static const float labelAlignments[] = { 0.0, 1.0, 0.5 }; gtk_misc_set_alignment(GTK_MISC(m_widget), labelAlignments[justify], 0.0); - // do not move this call elsewhere - gtk_label_set_line_wrap( GTK_LABEL(m_widget), FALSE ); + gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE ); + +#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__ + + SetLabel(label); m_parent->DoAddChild( this ); PostCreation(size); - + // the bug below only happens with GTK 2 -#ifdef __WXGTK20__ if ( justify != GTK_JUSTIFY_LEFT ) { // 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) - gtk_signal_disconnect_by_func - ( - GTK_OBJECT(m_widget), - GTK_SIGNAL_FUNC(wxgtk_window_size_request_callback), - (gpointer) this - ); + g_signal_handlers_disconnect_by_func (m_widget, + (gpointer) wxgtk_window_size_request_callback, + this); } -#endif // __WXGTK20__ return TRUE; } wxString wxStaticText::GetLabel() const { - GtkLabel *label = GTK_LABEL(m_widget); - -#ifdef __WXGTK20__ - wxString str = wxGTK_CONV_BACK( gtk_label_get_text( label ) ); -#else - wxString str = wxString( label->label ); -#endif - - return wxString(str); + // we need to return the label just like it was passed to the last call + // to SetLabel(): i.e. with wx-style mnemonics and with markup + return wxControl::GetLabel(); } -void wxStaticText::SetLabel( const wxString &label ) +void wxStaticText::SetLabel( const wxString& str ) { -#if 0 - // Build the colorized version of the label - wxString colorlabel = label; - // If the color has been set, create a markup string to pass to the label setter - if (m_foregroundColour.Ok()) - { - colorlabel.Printf(_T("%s"), m_foregroundColour.Red(), - m_foregroundColour.Green(), m_foregroundColour.Blue(), label.c_str()); - } - - wxControl::SetLabel(label); + wxCHECK_RET( m_widget != NULL, wxT("invalid static text") ); - // markup only allowed under GTK2 -#ifdef __WXGTK20__ - gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) ); -#else - gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); -#endif + // save the label inside m_labelOrig in case user calls GetLabel() later + m_labelOrig = str; -#else + 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. - wxControl::SetLabel(label); - gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); -#endif + 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() ); - SetSizeHints(GetSize()); - } } bool wxStaticText::SetFont( const wxFont &font ) { + const bool wasUnderlined = GetFont().GetUnderlined(); + 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); + + 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 + { + 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); + gtk_label_set_attributes(GTK_LABEL(m_widget), attrs); + pango_attr_list_unref(attrs); + } + } + // adjust the label size to the new label unless disabled if (!HasFlag(wxST_NO_AUTORESIZE)) { + InvalidateBestSize(); SetSize( GetBestSize() ); - SetSizeHints(GetSize()); } return ret; } -void wxStaticText::ApplyWidgetStyle() +void wxStaticText::DoSetSize(int x, int y, + int width, int height, + int sizeFlags ) { - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); + wxControl::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 @@ -185,17 +218,22 @@ wxSize wxStaticText::DoGetBestSize() const // Do not return any arbitrary default value... wxASSERT_MSG( m_widget, wxT("wxStaticText::DoGetBestSize called before creation") ); - // this invalidates the size request - gtk_label_set_line_wrap( GTK_LABEL(m_widget), TRUE ); - 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 = 2; - req.height = 2; + req.width = -1; + req.height = -1; (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req ); - return wxSize(req.width, req.height); + 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) @@ -207,6 +245,30 @@ bool wxStaticText::SetForegroundColour(const wxColour& colour) return true; } +bool wxStaticText::GTKWidgetNeedsMnemonic() const +{ + return true; +} + +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))