From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Fri, 17 May 2002 12:22:14 +0000 (+0000)
Subject: using QD Text under non OSX
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/54ddeb7e1bb71cd067c667e129726bcdc16948f0?ds=inline

using QD Text under non OSX


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

diff --git a/src/mac/carbon/uma.cpp b/src/mac/carbon/uma.cpp
index 219a067bb3..9e84f4d9e9 100644
--- a/src/mac/carbon/uma.cpp
+++ b/src/mac/carbon/uma.cpp
@@ -118,12 +118,19 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
         { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } ,
     } ;
     int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
-#if TARGET_CARBON  
+#if 0 // TARGET_CARBON  
     --noOfFontDescriptions ;
 #endif
   	// kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke
-  	TXNInitTextension(fontDescriptions,  noOfFontDescriptions, ( kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
-	}
+  	OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
+#if TARGET_CARBON
+    if ( !UMAHasAquaLayout() )
+#endif
+    {
+        options |= kTXNAlwaysUseQuickDrawTextMask ;
+    }
+  	TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
+  }
 
   long menuMgrAttr ;
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 219a067bb3..9e84f4d9e9 100644
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -118,12 +118,19 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
         { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } ,
     } ;
     int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
-#if TARGET_CARBON  
+#if 0 // TARGET_CARBON  
     --noOfFontDescriptions ;
 #endif
   	// kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke
-  	TXNInitTextension(fontDescriptions,  noOfFontDescriptions, ( kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
-	}
+  	OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
+#if TARGET_CARBON
+    if ( !UMAHasAquaLayout() )
+#endif
+    {
+        options |= kTXNAlwaysUseQuickDrawTextMask ;
+    }
+  	TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
+  }
 
   long menuMgrAttr ;
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;