From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Wed, 31 Mar 2004 16:45:37 +0000 (+0000)
Subject: scrollbars added
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/d3016f302956cdadd4191dbe94ef5ceb304ddf8e

scrollbars added


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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index e99c566bdd..82bf84e6df 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -784,10 +784,31 @@ bool wxTextCtrl::Create(wxWindow *parent, wxWindowID id,
     {
 #if wxMAC_USE_MLTE_HIVIEW
         HIRect hr = { bounds.left , bounds.top , bounds.right - bounds.left , bounds.bottom- bounds.top } ;
-        HITextViewCreate( &hr , 0, FrameOptionsFromWXStyle( m_windowStyle ) , (ControlRef*) &m_macControl ) ;
-        m_macTXN = HITextViewGetTXNObject((ControlRef) m_macControl) ;
-        AdjustAttributesFromWXStyle( (TXNObject) m_macTXN , m_windowStyle , true ) ;
-        HIViewSetVisible( (ControlRef) m_macControl , true ) ;
+        HIViewRef scrollView = NULL ;
+        TXNFrameOptions frameOptions = FrameOptionsFromWXStyle( style ) ;
+
+        if ( frameOptions & (kTXNWantVScrollBarMask|kTXNWantHScrollBarMask) )
+        {
+            HIScrollViewCreate(( frameOptions & kTXNWantHScrollBarMask ? kHIScrollViewOptionsHorizScroll : 0) | 
+                ( frameOptions & kTXNWantVScrollBarMask ? kHIScrollViewOptionsVertScroll: 0 ) , &scrollView ) ;
+           
+        	HIViewSetFrame( scrollView, &hr );
+        	HIViewSetVisible( scrollView, true );
+        }
+        HIViewRef textView ;
+        HITextViewCreate( NULL , 0, frameOptions , (ControlRef*) &textView ) ;
+        m_macTXN = HITextViewGetTXNObject( textView) ;
+        AdjustAttributesFromWXStyle( (TXNObject) m_macTXN , style , true ) ;
+        HIViewSetVisible( (ControlRef) textView , true ) ;
+        if ( scrollView )
+        {
+            HIViewAddSubview( scrollView , textView ) ;
+            m_macControl = scrollView ;
+        }
+        else
+        {
+            m_macControl = textView ;
+        }
 #else
         short featurSet;