From 957165f103b6f0b617f063d426d91e5c77d94326 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Mon, 29 Mar 2004 12:12:15 +0000 Subject: [PATCH] fixed multiline wrap-around git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/textctrl.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp index 2f80c04e00..f8a1b8e3d2 100644 --- a/src/mac/carbon/textctrl.cpp +++ b/src/mac/carbon/textctrl.cpp @@ -174,6 +174,7 @@ OSStatus MLTESetObjectVisibility( STPTextPaneVars *varsp, Boolean vis , long wxS Rect bounds ; UMAGetControlBoundsInWindowCoords( varsp->fUserPaneRec, &bounds); TPCalculateBounds( varsp , bounds ) ; + wxMacWindowClipper cl(textctrl) ; TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left, varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame); TXNShowSelection( varsp->fTXNRec, kTXNShowStart); @@ -205,6 +206,7 @@ static void TPUpdateVisibility(ControlRef theControl) { // we only recalculate when visible, otherwise scrollbars get drawn at incorrect places if ( varsp->fVisible ) { + wxMacWindowClipper cl(textctrl) ; TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left, varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame); } @@ -602,13 +604,12 @@ OSStatus mUPOpenControl(STPTextPaneVars* &handle, ControlRef theControl, long wx int toptag = 2 ; #if TARGET_API_MAC_OSX iControlTags[2] = kTXNVisibilityTag ; - iControlData[2].uValue = false ; + iControlData[2].uValue = varsp->fVisible ; toptag++ ; #endif - iControlData[1].uValue = varsp->fVisible ; if ( (wxStyle & wxTE_MULTILINE) && (wxStyle & wxTE_DONTWRAP) ) - iControlData[2].uValue = kTXNNoAutoWrap ; + iControlData[1].uValue = kTXNNoAutoWrap ; verify_noerr( TXNSetTXNObjectControls( varsp->fTXNRec, false, toptag, iControlTags, iControlData )) ; -- 2.47.2