Fix handling of wxST_NO_AUTORESIZE in wxOSX.

We do need to set the size of wxStaticText initially even when this style is
specified, it only tells us to not update it later. Otherwise even the initial
label was never shown in full.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73599 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/osx/stattext_osx.cpp b/src/osx/stattext_osx.cpp
index 9c163f8b59d6e7c32af7d01f57d51436f3824341..acbb1f67badaba87869bcd14f9031e5dbc8aa411 100644 (file)
--- a/src/osx/stattext_osx.cpp
+++ b/src/osx/stattext_osx.cpp
@@ -46,6 +46,14 @@ bool wxStaticText::Create( wxWindow *parent,
     MacPostControlCreate( pos, size );
 
     SetLabel(label);
+    if ( HasFlag(wxST_NO_AUTORESIZE) )
+    {
+        // Normally this is done in SetLabel() below but we avoid doing it when
+        // this style is used, so we need to explicitly do it in the ctor in
+        // this case or otherwise the control would retain its initial tiny size.
+        InvalidateBestSize();
+        SetInitialSize(size);
+    }
 
     return true;
 }