X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9f8845289521c7f53e95b6dfd8275daab8b05639..caa2490c0fb8053b1d416117a9619695d75af9e4:/src/gtk1/stattext.cpp diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index c245fd315c..9b5aa5cb2f 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -132,20 +132,20 @@ void wxStaticText::SetLabel( const wxString &label ) #ifdef __WXGTK20__ // Build the colorized version of the label (markup only allowed // under GTK2): - wxString colorlabel = label; - // If the color has been set, create a markup string to pass to - // the label setter 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(), label.c_str()); + m_foregroundColour.Blue(), + wxEscapeStringForPangoMarkup(label).c_str()); + gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) ); } - - gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) ); -#else - gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); + 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))