don't call CopyBeforeWrite when returning non-const interator if the string is empty...

[wxWidgets.git] / src / gtk1 / stattext.cpp

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