X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c0e6c0513862fc9a33e5800526058193b7492d8b..a76342da418c75ead546ce2025db24dad261d237:/src/gtk/stattext.cpp?ds=sidebyside diff --git a/src/gtk/stattext.cpp b/src/gtk/stattext.cpp index d659e8cc16..c245fd315c 100644 --- 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)