The markup code for wxStaticText doesn't work.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 89594853ae3c86e34eaf5be907cc7d4a3c47a08e..bfca9d94098307711b5d5af34b21e81cdbd2f816 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -127,6 +127,7 @@ wxString wxStaticText::GetLabel() const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
 
 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
     // 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


@@ -145,6 +146,13 @@ void wxStaticText::SetLabel( const wxString &label )
     gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
 #endif
 
     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 ) );
+#endif
+
+

     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
     {
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
     {

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 89594853ae3c86e34eaf5be907cc7d4a3c47a08e..bfca9d94098307711b5d5af34b21e81cdbd2f816 100644 (file)
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -127,6 +127,7 @@ wxString wxStaticText::GetLabel() const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
 
 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
     // 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


@@ -145,6 +146,13 @@ void wxStaticText::SetLabel( const wxString &label )
     gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
 #endif
 
     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 ) );
+#endif
+
+

     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
     {
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
     {