fixed bug in SetStyle() which wouldn't reset the slant if it had been set before

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

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index 219a067bb3100a96f3cb65fcaf54940ea83df791..7f121246988b93a9d7c54cfe11cea65ad6848ee0 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -104,6 +104,11 @@ void UMAInitToolbox( UInt16 inMoreMastersCalls )
                NavLoad() ;
        }
 
+  long menuMgrAttr ;
+  Gestalt( gestaltMenuMgrAttr , &menuMgrAttr ) ;
+  if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
+    sUMAHasAquaLayout = true ;
+
   if ( TXNInitTextension != (void*) kUnresolvedCFragSymbolAddress )
   { 
     FontFamilyID fontId ;
@@ -118,17 +123,21 @@ 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 ) ;
-  if ( menuMgrAttr & gestaltMenuMgrAquaLayoutMask )
-    sUMAHasAquaLayout = true ;
   sUMASystemInitialized = true ;
 
 }
@@ -213,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 ;