From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Tue, 27 Nov 2012 08:29:24 +0000 (+0000)
Subject: workaround, see #14856
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/96943967a559f8251349899ff6a45ad898bdc669

workaround, see #14856

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

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index c4bd4dfa93..89f0953362 100644
--- a/include/wx/scrolwin.h
+++ b/include/wx/scrolwin.h
@@ -378,10 +378,17 @@ public:
         if ( !(style & (wxHSCROLL | wxVSCROLL)) )
             style |= wxHSCROLL | wxVSCROLL;
 
+#ifdef __WXOSX__
+        bool retval = T::Create(parent, winid, pos, size, style, name);
+        if ( retval && (style & wxALWAYS_SHOW_SB) )
+            ShowScrollbars(wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS);
+        return retval;
+#else
         if ( style & wxALWAYS_SHOW_SB )
             ShowScrollbars(wxSHOW_SB_ALWAYS, wxSHOW_SB_ALWAYS);
 
         return T::Create(parent, winid, pos, size, style, name);
+#endif
     }
 
     // we need to return a special WM_GETDLGCODE value to process just the