From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Thu, 18 May 2006 08:06:34 +0000 (+0000)
Subject: using ATSUI also in textctrl
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/acead93d81dbbecc2410b2d3901b7e8accf93e00

using ATSUI also in textctrl


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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 1a04cf533c..7df6dba021 100644
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1785,6 +1785,8 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo
     if ( style.HasFont() )
     {
         const wxFont &font = style.GetFont() ;
+                
+#if 0 // old version
         wxMacStringToPascal( font.GetFaceName() , fontName ) ;
         fontSize = font.GetPointSize() ;
         if ( font.GetUnderlined() )
@@ -1808,6 +1810,12 @@ void wxMacMLTEControl::TXNSetAttribute( const wxTextAttr& style , long from , lo
         typeAttr[attrCount].size = kTXNQDFontStyleAttributeSize ;
         typeAttr[attrCount].data.dataValue = fontStyle ;
         attrCount++ ;
+#else
+        typeAttr[attrCount].tag = kTXNATSUIStyle ;
+        typeAttr[attrCount].size = kTXNATSUIStyleSize ;
+        typeAttr[attrCount].data.dataValue = (UInt32)font.MacGetATSUStyle() ;
+        attrCount++ ;
+#endif
     }
 
     if ( style.HasTextColour() )