allowing vertical scrolling even if wxTE_NO_VSCROLL is given, displaying a scrollbar...

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index f4a3f34178b0ebadbd2a63e4abd68502a3468dfb..fd154aae35d3f1749e05805c4f2766565fcc31f1 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -3027,12 +3027,20 @@ wxMacMLTEHIViewControl::wxMacMLTEHIViewControl( wxTextCtrl *wxPeer,
 
     m_scrollView = NULL ;
     TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( style ) ;
-    if ( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask) )
+    if (( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask)) || !(frameOptions &kTXNSingleLineOnlyMask))
     {
-        HIScrollViewCreate(
-            (frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0)
-            | (frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll : 0) ,
-            &m_scrollView ) ;
+        if ( frameOptions & (kTXNWantVScrollBarMask | kTXNWantHScrollBarMask) )
+        {
+            HIScrollViewCreate(
+                (frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0)
+                | (frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll : 0) ,
+                &m_scrollView ) ;
+        }
+        else
+        {
+            HIScrollViewCreate(kHIScrollViewOptionsVertScroll,&m_scrollView);
+            HIScrollViewSetScrollBarAutoHide(m_scrollView,true);
+        }
 
         HIViewSetFrame( m_scrollView, &hr );
         HIViewSetVisible( m_scrollView, true );