X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8eebb9543004e8a1bf91d84d7ee38f33f977450..5a9819026e56a43892e3f291215022a9df33a52f:/src/mac/uma.cpp

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index a8f29cbbfd..219a067bb3 100644
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -106,12 +106,23 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
 
   if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
   { 
-    TXNMacOSPreferredFontDescription defaults;
-    defaults.fontID = kFontIDGeneva ;
-    defaults.pointSize = (10 << 16) ;
-    defaults.fontStyle = kTXNDefaultFontStyle;
-    defaults.encoding = kTXNSystemDefaultEncoding;
-  	TXNInitTextension(&defaults,  1, (kTXNAlwaysUseQuickDrawTextMask | kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask));
+    FontFamilyID fontId ;
+	Str255 fontName ;
+	SInt16 fontSize ;
+	Style fontStyle ;
+	GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ;
+    GetFNum( fontName, &fontId );
+
+    TXNMacOSPreferredFontDescription fontDescriptions[] =
+    {
+        { fontId , (fontSize << 16) ,kTXNDefaultFontStyle, kTXNSystemDefaultEncoding } ,
+    } ;
+    int noOfFontDescriptions = sizeof( fontDescriptions ) / sizeof(TXNMacOSPreferredFontDescription) ;
+#if 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));
 	}
 
   long menuMgrAttr ;