X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8375af8ff97a3649361b988a40b991a8cdaab09..abd474ea63667f727940a009cc3e0b23ba9f418f:/src/gtk/stattext.cpp?ds=sidebyside diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index a10e98f85b..7e8bfead1e 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: stattext.cpp +// Name: src/gtk/stattext.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -15,20 +15,10 @@ #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 //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl) - wxStaticText::wxStaticText() { } @@ -60,31 +50,26 @@ bool wxStaticText::Create(wxWindow *parent, } m_widget = gtk_label_new(NULL); + g_object_ref(m_widget); GtkJustification justify; - if ( style & wxALIGN_CENTER ) + if ( style & wxALIGN_CENTER_HORIZONTAL ) 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 - 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 ); - #ifdef __WXGTK26__ if (!gtk_check_version(2,6,0)) { @@ -101,65 +86,70 @@ bool wxStaticText::Create(wxWindow *parent, } #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); - // the bug below only happens with GTK 2 - if ( justify != GTK_JUSTIFY_LEFT ) + return true; +} + +void wxStaticText::GTKDoSetLabel(GTKLabelSetter setter, const wxString& label) +{ + wxCHECK_RET( m_widget != NULL, wxT("invalid static text") ); + + 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+. { - // 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); + (this->*setter)(GTK_LABEL(m_widget), label); } - return TRUE; + // 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() ); } -wxString wxStaticText::GetLabel() const +void wxStaticText::SetLabel(const wxString& label) { - // 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(); -} + m_labelOrig = label; -void wxStaticText::SetLabel( const wxString& str ) -{ - wxCHECK_RET( m_widget != NULL, wxT("invalid static text") ); + GTKDoSetLabel(&wxStaticText::GTKSetLabelForLabel, label); +} - // save the label inside m_labelOrig in case user calls GetLabel() later - m_labelOrig = str; +#if wxUSE_MARKUP - 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. +bool wxStaticText::DoSetLabelMarkup(const wxString& markup) +{ + const wxString stripped = RemoveMarkup(markup); + if ( stripped.empty() && !markup.empty() ) + return false; - label = GetEllipsizedLabelWithoutMarkup(); - } + m_labelOrig = stripped; - if ( HasFlag(wxST_MARKUP) ) - GTKSetLabelWithMarkupForLabel(GTK_LABEL(m_widget), label); - else - GTKSetLabelForLabel(GTK_LABEL(m_widget), label); + GTKDoSetLabel(&wxStaticText::GTKSetLabelWithMarkupForLabel, markup); - // adjust the label size to the new label unless disabled - if ( !HasFlag(wxST_NO_AUTORESIZE) && - !IsEllipsized() ) // if ellipsize is ON, then we don't want to get resized! - SetSize( GetBestSize() ); + return true; } +#endif // wxUSE_MARKUP + bool wxStaticText::SetFont( const wxFont &font ) { const bool wasUnderlined = GetFont().GetUnderlined(); @@ -193,17 +183,16 @@ 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; } void wxStaticText::DoSetSize(int x, int y, - int width, int height, - int sizeFlags ) + 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)) { @@ -224,25 +213,14 @@ wxSize wxStaticText::DoGetBestSize() const // 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(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