From: Robert Roebling <robert@roebling.de>
Date: Mon, 29 Mar 2004 18:07:31 +0000 (+0000)
Subject:   Applied SetForegorund colour patch for GTK2.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/174b10af3488cc926c5f0336db457f125a506f51?ds=inline

  Applied SetForegorund colour patch for GTK2.


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

diff --git a/include/wx/gtk/stattext.h b/include/wx/gtk/stattext.h
index 30b0424934..ca98ba9015 100644
--- a/include/wx/gtk/stattext.h
+++ b/include/wx/gtk/stattext.h
@@ -58,6 +58,7 @@ public:
     void SetLabel( const wxString &label );
 
     bool SetFont( const wxFont &font );
+    bool SetForegroundColour( const wxColour& colour );
     
     // implementation
     // --------------
diff --git a/include/wx/gtk1/stattext.h b/include/wx/gtk1/stattext.h
index 30b0424934..ca98ba9015 100644
--- a/include/wx/gtk1/stattext.h
+++ b/include/wx/gtk1/stattext.h
@@ -58,6 +58,7 @@ public:
     void SetLabel( const wxString &label );
 
     bool SetFont( const wxFont &font );
+    bool SetForegroundColour( const wxColour& colour );
     
     // implementation
     // --------------
diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 228cac559f..6e0916a79a 100644
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -148,9 +148,23 @@ wxString wxStaticText::GetLabel() const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
+    // 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("<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
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
@@ -192,4 +206,13 @@ wxSize wxStaticText::DoGetBestSize() const
     return wxSize(req.width, req.height);
 }
 
+bool wxStaticText::SetForegroundColour(const wxColour& colour)
+{
+    // First, we call the base class member
+    wxControl::SetForegroundColour(colour);
+    // Then, to force the color change, we set the label with the current label
+    SetLabel(GetLabel());
+    return true;
+}
+
 #endif // wxUSE_STATTEXT
diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 228cac559f..6e0916a79a 100644
--- a/src/gtk1/stattext.cpp
+++ b/src/gtk1/stattext.cpp
@@ -148,9 +148,23 @@ wxString wxStaticText::GetLabel() const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
+    // 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("<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
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
@@ -192,4 +206,13 @@ wxSize wxStaticText::DoGetBestSize() const
     return wxSize(req.width, req.height);
 }
 
+bool wxStaticText::SetForegroundColour(const wxColour& colour)
+{
+    // First, we call the base class member
+    wxControl::SetForegroundColour(colour);
+    // Then, to force the color change, we set the label with the current label
+    SetLabel(GetLabel());
+    return true;
+}
+
 #endif // wxUSE_STATTEXT