X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/abdeb9e7006488bf917d90048fcd0cbe22f44a71..304205f142fec6fab5d4166263b641cd2828fcb9:/src/gtk1/stattext.cpp

diff --git a/src/gtk1/stattext.cpp b/src/gtk1/stattext.cpp
index 7073bcd6cc..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,19 +127,21 @@ wxString wxStaticText::GetLabel() const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
-    // 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 ) );
@@ -199,4 +201,11 @@ bool wxStaticText::SetForegroundColour(const wxColour& colour)
     return true;
 }
 
+// static
+wxVisualAttributes
+wxStaticText::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
+{
+    return GetDefaultAttributesFromGTKWidget(gtk_label_new);
+}
+
 #endif // wxUSE_STATTEXT