fixing auto wrap and default font

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index f8a1b8e3d241ad65f253b9dee18de4a103f5fc0b..3e4445ebd2a9263f327cb6314211076ecb454c14 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -600,7 +600,7 @@ OSStatus mUPOpenControl(STPTextPaneVars* &handle, ControlRef theControl, long wx
         &varsp->fTXNRec, &varsp->fTXNFrame, (TXNObjectRefcon) varsp));
 
     TXNControlTag iControlTags[3] = { kTXNDoFontSubstitution, kTXNWordWrapStateTag };
         &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 ;
     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        
     
     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 )) ;
 
     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 ;
 
     SInt16 fontSize ;
     Style fontStyle ;
 

-    GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+    GetThemeFont(kThemeSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;

 
     TXNTypeAttributes typeAttr[] =
     {
 
     TXNTypeAttributes typeAttr[] =
     {