allow a - at the beginning of a menu item (would become a separator by default)

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

diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp
index d659e8cc167cbb7ab1acc629beabdbe2226d5a48..c245fd315c96c06415602ad9195a9dd8d63754fc 100644 (file)
--- a/src/gtk/stattext.cpp
+++ b/src/gtk/stattext.cpp
@@ -150,8 +150,8 @@ void wxStaticText::SetLabel( const wxString &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)