Call Dismiss rather than Show(false) on the infobar to correct the layout.

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index 61ba78062bdec0608377252c3b4d6dc61c2d881a..7e8bfead1e8843db9c9ec2de4f32a8d5cfb86b64 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        stattext.cpp
+// Name:        src/gtk/stattext.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
@@ -19,8 +19,6 @@
 // wxStaticText
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxStaticText,wxControl)
-
 wxStaticText::wxStaticText()
 {
 }
@@ -103,32 +101,24 @@ bool wxStaticText::Create(wxWindow *parent,
     return true;
 }
 
-void wxStaticText::SetLabel( const wxString& str )
+void wxStaticText::GTKDoSetLabel(GTKLabelSetter setter, const wxString& label)
 {
     wxCHECK_RET( m_widget != NULL, wxT("invalid static text") );
 
-    // save the label inside m_labelOrig in case user calls GetLabel() later
-    m_labelOrig = str;
-
     InvalidateBestSize();
 
-    wxString label(str);
-    if (gtk_check_version(2,6,0) &&
-        IsEllipsized())
+    if (gtk_check_version(2,6,0) && IsEllipsized())
     {
-        // GTK+ < 2.6 does not support ellipsization:
-        // since we need to use our generic code for ellipsization (which does not
-        // behaves well in conjunction with markup; i.e. it may break the markup
-        // validity erasing portions of the string), we also need to strip out
-        // the markup (if present) from the label.
-
-        label = GetEllipsizedLabelWithoutMarkup();
+        // GTK+ < 2.6 does not support ellipsization so we need to do it
+        // manually and as our ellipsization code doesn't deal with markup, we
+        // have no choice but to ignore it in this case and always use plain
+        // text.
+        GTKSetLabelForLabel(GTK_LABEL(m_widget), GetEllipsizedLabel());
+    }
+    else // Ellipsization not needed or supported by GTK+.
+    {
+        (this->*setter)(GTK_LABEL(m_widget), label);
     }
-
-    if ( HasFlag(wxST_MARKUP) )
-        GTKSetLabelWithMarkupForLabel(GTK_LABEL(m_widget), label);
-    else
-        GTKSetLabelForLabel(GTK_LABEL(m_widget), label);
 
     // adjust the label size to the new label unless disabled
     if ( !HasFlag(wxST_NO_AUTORESIZE) &&
@@ -136,6 +126,30 @@ void wxStaticText::SetLabel( const wxString& str )
         SetSize( GetBestSize() );
 }
 
+void wxStaticText::SetLabel(const wxString& label)
+{
+    m_labelOrig = label;
+
+    GTKDoSetLabel(&wxStaticText::GTKSetLabelForLabel, label);
+}
+
+#if wxUSE_MARKUP
+
+bool wxStaticText::DoSetLabelMarkup(const wxString& markup)
+{
+    const wxString stripped = RemoveMarkup(markup);
+    if ( stripped.empty() && !markup.empty() )
+        return false;
+
+    m_labelOrig = stripped;
+
+    GTKDoSetLabel(&wxStaticText::GTKSetLabelWithMarkupForLabel, markup);
+
+    return true;
+}
+
+#endif // wxUSE_MARKUP
+
 bool wxStaticText::SetFont( const wxFont &font )
 {
     const bool wasUnderlined = GetFont().GetUnderlined();
@@ -230,11 +244,7 @@ wxString wxStaticText::DoGetLabel() const
 
 void wxStaticText::DoSetLabel(const wxString& str)
 {
-    // this function looks like GTKSetLabelForLabel() but here we just want to modify
-    // the GTK control without altering any internal wxStaticText variable
-    
-    const wxString labelGTK = GTKConvertMnemonics(str);
-    gtk_label_set_text_with_mnemonic(GTK_LABEL(m_widget), wxGTK_CONV(labelGTK));
+    GTKSetLabelForLabel(GTK_LABEL(m_widget), str);
 }
 
 // static