Add missing wxUSE_OLE checks to safearray.cpp.

[wxWidgets.git] / include / wx / scrolwin.h

diff --git a/include/wx/scrolwin.h b/include/wx/scrolwin.h
index c4bd4dfa933be325826fe097e8ba942346cac879..89f0953362cf24bb85a3691d81a373a6b7f74ea7 100644 (file)
--- 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