Apply choice patch for proper handling of clearing

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 89594853ae3c86e34eaf5be907cc7d4a3c47a08e..9b5aa5cb2f2faa946d2bfd0c65b38ed36a07e6d6 100644 (file)
--- 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 ))
     {
     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;
     }
 
         return FALSE;
     }
 


@@ -127,29 +127,31 @@ wxString wxStaticText::GetLabel() const
 
 void wxStaticText::SetLabel( const wxString &label )
 {
 
 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);
 
     wxControl::SetLabel(label);
 

-    // markup only allowed under GTK2

 #ifdef __WXGTK20__
 #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 ) );
+    // Build the colorized version of the label (markup only allowed
+    // under GTK2):
+    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(),
+                          wxEscapeStringForPangoMarkup(label).c_str());
+        gtk_label_set_markup( GTK_LABEL(m_widget), wxGTK_CONV( colorlabel ) );
+    }
+    else

 #endif
 #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))
     {
 
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
     {

+        InvalidateBestSize();

         SetSize( GetBestSize() );
         SetSize( GetBestSize() );

-        SetSizeHints(GetSize());

     }
 }
 
     }
 }
 


@@ -160,18 +162,12 @@ bool wxStaticText::SetFont( const wxFont &font )
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
     {
     // adjust the label size to the new label unless disabled
     if (!HasFlag(wxST_NO_AUTORESIZE))
     {

+        InvalidateBestSize();

         SetSize( GetBestSize() );
         SetSize( GetBestSize() );

-        SetSizeHints(GetSize());

     }
     return ret;
 }
 
     }
     return ret;
 }
 

-void wxStaticText::ApplyWidgetStyle()
-{
-    SetWidgetStyle();
-    gtk_widget_set_style( m_widget, m_widgetStyle );
-}
-

 wxSize wxStaticText::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...
 wxSize wxStaticText::DoGetBestSize() const
 {
     // Do not return any arbitrary default value...


@@ -187,7 +183,9 @@ wxSize wxStaticText::DoGetBestSize() const
     (* GTK_WIDGET_CLASS( GTK_OBJECT_GET_CLASS(m_widget) )->size_request )
         (m_widget, &req );
 
     (* 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)
 }
 
 bool wxStaticText::SetForegroundColour(const wxColour& colour)