old mingw32 compilation fix

[wxWidgets.git] / src / mac / uma.cpp

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index a8f29cbbfdfe086e078213668870a7ee69599c12..f6bd01f91f09360764787645054b9a3b3b78ec73 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -104,20 +104,40 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                NavLoad() ;
        }
 
-  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));
-       }
-
   long menuMgrAttr ;
   Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
   if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
     sUMAHasAquaLayout = true ;
+
+  if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
+  { 
+    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 0 // TARGET_CARBON  
+    --noOfFontDescriptions ;
+#endif
+       // kTXNAlwaysUseQuickDrawTextMask might be desirable because of speed increases but it crashes the app under OS X upon key stroke
+       OptionBits options = kTXNWantMoviesMask | kTXNWantSoundMask | kTXNWantGraphicsMask ;
+#if TARGET_CARBON
+    if ( !UMAHasAquaLayout() )
+#endif
+    {
+        options |= kTXNAlwaysUseQuickDrawTextMask ;
+    }
+       TXNInitTextension(fontDescriptions,  noOfFontDescriptions, options );
+  }
+
+
   sUMASystemInitialized = true ;
 
 }