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

fixing auto wrap and default font

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26500 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2004-03-30 18:29:00 +00:00
parent e1983ab588
commit 413844c2d4
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -600,7 +600,7 @@ OSStatus mUPOpenControl(STPTextPaneVars* &handle, ControlRef theControl, long wx
&varsp->fTXNRec, &varsp->fTXNFrame, (TXNObjectRefcon) varsp));
TXNControlTag iControlTags[3] = { kTXNDoFontSubstitution, kTXNWordWrapStateTag };
TXNControlData iControlData[3] = { {false}, {kTXNAutoWrap} };
TXNControlData iControlData[3] = { {false}, {kTXNNoAutoWrap} };
int toptag = 2 ;
#if TARGET_API_MAC_OSX
iControlTags[2] = kTXNVisibilityTag ;
@@ -608,9 +608,14 @@ OSStatus mUPOpenControl(STPTextPaneVars* &handle, ControlRef theControl, long wx
toptag++ ;
#endif
if ( (wxStyle & wxTE_MULTILINE) && (wxStyle & wxTE_DONTWRAP) )
iControlData[1].uValue = kTXNNoAutoWrap ;
if ( wxStyle & wxTE_MULTILINE )
{
if (wxStyle & wxTE_DONTWRAP)
iControlData[1].uValue = kTXNNoAutoWrap ;
else
iControlData[1].uValue = kTXNAutoWrap ;
}
verify_noerr( TXNSetTXNObjectControls( varsp->fTXNRec, false, toptag,
iControlTags, iControlData )) ;
@@ -618,7 +623,7 @@ OSStatus mUPOpenControl(STPTextPaneVars* &handle, ControlRef theControl, long wx
SInt16 fontSize ;
Style fontStyle ;
GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
TXNTypeAttributes typeAttr[] =
{