From 8ccac79865dec829b3412ba76a9cd40037252247 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sun, 6 Jun 2004 14:49:21 +0000
Subject: [PATCH] restored colour labels until we have more information, it
 seems to work with all GTK2 versions

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/stattext.cpp  | 28 +++++++++++-----------------
 src/gtk1/stattext.cpp | 28 +++++++++++-----------------
 2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index bfca9d9409..1849d21f5d 100644
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/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,32 +127,26 @@ wxString wxStaticText::GetLabel() const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
-#if 0
-    // Build the colorized version of the label
+    wxControl::SetLabel(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 the color has been set, create a markup string to pass to
+    // the label setter
     if (m_foregroundColour.Ok())
     {
-        colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"), m_foregroundColour.Red(),
-        m_foregroundColour.Green(), m_foregroundColour.Blue(), label.c_str());
+        colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"),
+                          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 ) );
-#endif
-
-
     // 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 bfca9d9409..1849d21f5d 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,32 +127,26 @@ wxString wxStaticText::GetLabel() const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
-#if 0
-    // Build the colorized version of the label
+    wxControl::SetLabel(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 the color has been set, create a markup string to pass to
+    // the label setter
     if (m_foregroundColour.Ok())
     {
-        colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"), m_foregroundColour.Red(),
-        m_foregroundColour.Green(), m_foregroundColour.Blue(), label.c_str());
+        colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"),
+                          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 ) );
-#endif
-
-
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
     {
-- 
2.50.0