Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed multiline wrap-around

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26455 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-03-29 12:12:15 +00:00
parent 5d7e2c447a
commit 957165f103
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mac/carbon/textctrl.cpp
View File

@@ -174,6 +174,7 @@ OSStatus MLTESetObjectVisibility( STPTextPaneVars *varsp, Boolean vis , long wxS
Rect bounds ; Rect bounds ;
UMAGetControlBoundsInWindowCoords( varsp->fUserPaneRec, &bounds); UMAGetControlBoundsInWindowCoords( varsp->fUserPaneRec, &bounds);
TPCalculateBounds( varsp , bounds ) ; TPCalculateBounds( varsp , bounds ) ;
wxMacWindowClipper cl(textctrl) ;
TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left, TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame); varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
TXNShowSelection( varsp->fTXNRec, kTXNShowStart); 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 // we only recalculate when visible, otherwise scrollbars get drawn at incorrect places
if ( varsp->fVisible ) if ( varsp->fVisible )
{ {
wxMacWindowClipper cl(textctrl) ;
TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left, TXNSetFrameBounds( varsp->fTXNRec, varsp->fRTextArea.top, varsp->fRTextArea.left,
varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame); varsp->fRTextArea.bottom, varsp->fRTextArea.right, varsp->fTXNFrame);
} }
@@ -602,13 +604,12 @@ OSStatus mUPOpenControl(STPTextPaneVars* &handle, ControlRef theControl, long wx
int toptag = 2 ; int toptag = 2 ;
#if TARGET_API_MAC_OSX #if TARGET_API_MAC_OSX
iControlTags[2] = kTXNVisibilityTag ; iControlTags[2] = kTXNVisibilityTag ;
iControlData[2].uValue = false ; iControlData[2].uValue = varsp->fVisible ;
toptag++ ; toptag++ ;
#endif #endif
iControlData[1].uValue = varsp->fVisible ;
if ( (wxStyle & wxTE_MULTILINE) && (wxStyle & wxTE_DONTWRAP) ) if ( (wxStyle & wxTE_MULTILINE) && (wxStyle & wxTE_DONTWRAP) )
iControlData[2].uValue = kTXNNoAutoWrap ; iControlData[1].uValue = kTXNNoAutoWrap ;
verify_noerr( TXNSetTXNObjectControls( varsp->fTXNRec, false, toptag, verify_noerr( TXNSetTXNObjectControls( varsp->fTXNRec, false, toptag,
iControlTags, iControlData )) ; iControlTags, iControlData )) ;