From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sun, 3 Mar 2013 22:44:17 +0000 (+0000)
Subject: Fix handling of wxST_NO_AUTORESIZE in wxOSX.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e465e64881541f817b8b5b065d4f477e9f012753

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 9c163f8b59..acbb1f67ba 100644
--- 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;
 }