From 66bd83b4ec25c06bbd72cf2aa7cedd94892660b4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 27 Jun 2004 13:42:17 +0000 Subject: [PATCH] fixed setting colour of wxStaticText in case the label contains XML special characters git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28041 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/private.h | 5 +++++ include/wx/gtk1/private.h | 5 +++++ src/gtk/stattext.cpp | 15 ++++++++------- src/gtk/utilsgtk.cpp | 37 +++++++++++++++++++++++++++++++++++++ src/gtk1/stattext.cpp | 15 ++++++++------- src/gtk1/utilsgtk.cpp | 37 +++++++++++++++++++++++++++++++++++++ 6 files changed, 100 insertions(+), 14 deletions(-) diff --git a/include/wx/gtk/private.h b/include/wx/gtk/private.h index 85750269b5..9f4cd54c02 100644 --- a/include/wx/gtk/private.h +++ b/include/wx/gtk/private.h @@ -131,5 +131,10 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType) wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP; } +#ifdef __WXGTK20__ +// Escapes string so that it is valid Pango markup XML string: +wxString wxEscapeStringForPangoMarkup(const wxString& str); +#endif + #endif // _WX_GTK_PRIVATE_H_ diff --git a/include/wx/gtk1/private.h b/include/wx/gtk1/private.h index 85750269b5..9f4cd54c02 100644 --- a/include/wx/gtk1/private.h +++ b/include/wx/gtk1/private.h @@ -131,5 +131,10 @@ inline wxEventType GtkScrollWinTypeToWx(guint scrollType) wxEVT_SCROLLWIN_TOP - wxEVT_SCROLL_TOP; } +#ifdef __WXGTK20__ +// Escapes string so that it is valid Pango markup XML string: +wxString wxEscapeStringForPangoMarkup(const wxString& str); +#endif + #endif // _WX_GTK_PRIVATE_H_ diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index c245fd315c..6f068dc3d0 100644 --- a/src/gtk/stattext.cpp +++ b/src/gtk/stattext.cpp @@ -132,19 +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 #else - gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); + gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); #endif // adjust the label size to the new label unless disabled diff --git a/src/gtk/utilsgtk.cpp b/src/gtk/utilsgtk.cpp index cef8dbe54e..e76e3187f3 100644 --- a/src/gtk/utilsgtk.cpp +++ b/src/gtk/utilsgtk.cpp @@ -81,6 +81,43 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) } #endif +#ifdef __WXGTK20__ +// Escapes string so that it is valid Pango markup XML string: +wxString wxEscapeStringForPangoMarkup(const wxString& str) +{ + size_t len = str.length(); + wxString out; + out.Alloc(len); + for (size_t i = 0; i < len; i++) + { + wxChar c = str[i]; + switch (c) + { + case _T('&'): + out << _T("&"); + break; + case _T('<'): + out << _T("<"); + break; + case _T('>'): + out << _T(">"); + break; + case _T('\''): + out << _T("'"); + break; + case _T('"'): + out << _T("""); + break; + default: + out << c; + break; + } + } + return out; +} +#endif + + // ---------------------------------------------------------------------------- // display characterstics // ---------------------------------------------------------------------------- diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp index c245fd315c..6f068dc3d0 100644 --- a/src/gtk1/stattext.cpp +++ b/src/gtk1/stattext.cpp @@ -132,19 +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 #else - gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); + gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) ); #endif // adjust the label size to the new label unless disabled diff --git a/src/gtk1/utilsgtk.cpp b/src/gtk1/utilsgtk.cpp index cef8dbe54e..e76e3187f3 100644 --- a/src/gtk1/utilsgtk.cpp +++ b/src/gtk1/utilsgtk.cpp @@ -81,6 +81,43 @@ bool wxSetDetectableAutoRepeat( bool WXUNUSED(flag) ) } #endif +#ifdef __WXGTK20__ +// Escapes string so that it is valid Pango markup XML string: +wxString wxEscapeStringForPangoMarkup(const wxString& str) +{ + size_t len = str.length(); + wxString out; + out.Alloc(len); + for (size_t i = 0; i < len; i++) + { + wxChar c = str[i]; + switch (c) + { + case _T('&'): + out << _T("&"); + break; + case _T('<'): + out << _T("<"); + break; + case _T('>'): + out << _T(">"); + break; + case _T('\''): + out << _T("'"); + break; + case _T('"'): + out << _T("""); + break; + default: + out << c; + break; + } + } + return out; +} +#endif + + // ---------------------------------------------------------------------------- // display characterstics // ---------------------------------------------------------------------------- -- 2.45.2