using font substitution (allows for fallbacks when unicode chars are not available...

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

diff --git a/src/mac/carbon/textctrl.cpp b/src/mac/carbon/textctrl.cpp
index 5b29292da49bcbd01b0bdbe91f2b915a1fe906de..9397ea6acde5f8c5f63cb8fb76ce9b7049de3acd 100644 (file)
--- a/src/mac/carbon/textctrl.cpp
+++ b/src/mac/carbon/textctrl.cpp
@@ -1488,7 +1488,7 @@ void wxMacMLTEControl::SetStringValue( const wxString &str)
 TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle )
 {
     TXNFrameOptions frameOptions =
 TXNFrameOptions wxMacMLTEControl::FrameOptionsFromWXStyle( long wxStyle )
 {
     TXNFrameOptions frameOptions =

-        kTXNDontDrawCaretWhenInactiveMask ;
+        kTXNDontDrawCaretWhenInactiveMask | kTXNDoFontSubstitutionMask ;

 
     if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
         frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;
 
     if ( ! ( wxStyle & wxTE_NOHIDESEL ) )
         frameOptions |= kTXNDontDrawSelectionWhenInactiveMask ;


@@ -1528,7 +1528,7 @@ void wxMacMLTEControl::AdjustCreationAttributes( const wxColour &background, boo
         };
     TXNControlData iControlData[] = 
         { 
         };
     TXNControlData iControlData[] = 
         { 

-            {false}, 
+            {true}, 

             {kTXNNoAutoWrap},
         };
         
             {kTXNNoAutoWrap},
         };