Declare namespace std {} before using namespace std; for MetroWerks

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index d659e8cc167cbb7ab1acc629beabdbe2226d5a48..9b5aa5cb2f2faa946d2bfd0c65b38ed36a07e6d6 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -132,26 +132,26 @@ void wxStaticText::SetLabel( const wxString &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 (m_foregroundColour.Ok())
     {
+        // If the color has been set, create a markup string to pass to
+        // the label setter
+        wxString colorlabel;
         colorlabel.Printf(_T("<span foreground=\"#%02x%02x%02x\">%s</span>"),
                           m_foregroundColour.Red(), m_foregroundColour.Green(),
-                          m_foregroundColour.Blue(), label.c_str());
+                          m_foregroundColour.Blue(),
+                          wxEscapeStringForPangoMarkup(label).c_str());
+        gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
     }
-        
-    gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
-#else
-    gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
+    else
 #endif
+        gtk_label_set( GTK_LABEL(m_widget), wxGTK_CONV( m_label ) );
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
     {
+        InvalidateBestSize();
         SetSize( GetBestSize() );
-        SetSizeHints(GetSize());
     }
 }
 
@@ -162,8 +162,8 @@ bool wxStaticText::SetFont( const wxFont &font )
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
     {
+        InvalidateBestSize();
         SetSize( GetBestSize() );
-        SetSizeHints(GetSize());
     }
     return ret;
 }
@@ -183,7 +183,9 @@ wxSize wxStaticText::DoGetBestSize() const
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 
-    return wxSize(req.width, req.height);
+    wxSize best(req.width, req.height);
+    CacheBestSize(best);
+    return best;
 }
 
 bool wxStaticText::SetForegroundColour(const wxColour& colour)