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

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index a8f29cbbfd..7f12124698 100644
--- 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 ;
 
 }
@@ -202,40 +222,17 @@ void 			UMADisableMenuItem( MenuRef inMenu , MenuItemIndex inItem )
 
 void UMAAppendSubMenuItem( MenuRef menu , StringPtr l , SInt16 id ) 
 {
-	Str255 label ;
-	memcpy( label , l , l[0]+1 ) ;
-	// hardcoded adding of the submenu combination for mac
-
-	int theEnd = label[0] + 1; 
-	if (theEnd > 251) 
-		theEnd = 251; // mac allows only 255 characters
-	label[theEnd++] = '/';
-	label[theEnd++] = hMenuCmd; 
-	label[theEnd++] = '!';
-	label[theEnd++] = id ; 
-	label[theEnd] = 0x00;
-	label[0] = theEnd;
-	MacAppendMenu(menu, label);
+	MacAppendMenu(menu, l);
+	SetMenuItemHierarchicalID( menu , CountMenuItems( menu ) , id ) ;
 }
 
 void UMAInsertSubMenuItem( MenuRef menu , StringPtr l , MenuItemIndex item , SInt16 id  ) 
 {
-	Str255 label ;
-	memcpy( label , l , l[0]+1 ) ;
-	// hardcoded adding of the submenu combination for mac
-
-	int theEnd = label[0] + 1; 
-	if (theEnd > 251) 
-		theEnd = 251; // mac allows only 255 characters
-	label[theEnd++] = '/';
-	label[theEnd++] = hMenuCmd; 
-	label[theEnd++] = '!';
-	label[theEnd++] = id; 
-	label[theEnd] = 0x00;
-	label[0] = theEnd;
-	MacInsertMenuItem(menu, label , item);
+	MacInsertMenuItem(menu, l , item);
+	SetMenuItemHierarchicalID( menu , item , id ) ;
 }
 
+
 void UMAAppendMenuItem( MenuRef menu , StringPtr l , SInt16 key, UInt8 modifiers ) 
 {
 	Str255 label ;