X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47ca35dd35dede7deac393fb7b8ab892c4efef65..1d6560d796aefb5dbdf217109767b1054c68c291:/src/gtk1/stattext.cpp?ds=sidebyside diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index bfca9d9409..9b5aa5cb2f 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -61,7 +61,7 @@ bool wxStaticText::Create(wxWindow *parent, if (!PreCreation( parent, pos, size ) || !CreateBase( parent, id, pos, size, style, wxDefaultValidator, name )) { - wxFAIL_MSG( wxT("wxXX creation failed") ); + wxFAIL_MSG( wxT("wxStaticText creation failed") ); return FALSE; } @@ -127,37 +127,31 @@ wxString wxStaticText::GetLabel() const void wxStaticText::SetLabel( const wxString &label ) { -#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); - // 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 - -#else - - wxControl::SetLabel(label); - gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); + // Build the colorized version of the label (markup only allowed + // under GTK2): + if (m_foregroundColour.Ok()) + { + // If the color has been set, create a markup string to pass to + // the label setter + wxString colorlabel; + colorlabel.Printf(_T("%s"), + m_foregroundColour.Red(), m_foregroundColour.Green(), + m_foregroundColour.Blue(), + wxEscapeStringForPangoMarkup(label).c_str()); + gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) ); + } + else #endif - + gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); // adjust the label size to the new label unless disabled if (!HasFlag(wxST_NO_AUTORESIZE)) { + InvalidateBestSize(); SetSize( GetBestSize() ); - SetSizeHints(GetSize()); } } @@ -168,18 +162,12 @@ bool wxStaticText::SetFont( const wxFont &font ) // 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() -{ - SetWidgetStyle(); - gtk_widget_set_style( m_widget, m_widgetStyle ); -} - wxSize wxStaticText::DoGetBestSize() const { // Do not return any arbitrary default value... @@ -195,7 +183,9 @@ wxSize wxStaticText::DoGetBestSize() const (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request ) (m_widget, &req ); - return wxSize(req.width, req.height); + wxSize best(req.width, req.height); + CacheBestSize(best); + return best; } bool wxStaticText::SetForegroundColour(const wxColour& colour)