fix for getting CW Carbon Target

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

diff --git a/src/mac/uma.cpp b/src/mac/uma.cpp
index f6bd01f91f09360764787645054b9a3b3b78ec73..7f121246988b93a9d7c54cfe11cea65ad6848ee0 100644 (file)
--- a/src/mac/uma.cpp
+++ b/src/mac/uma.cpp
@@ -222,40 +222,17 @@ void                      UMADisableMenuItem( MenuRef inMenu , MenuItemIndex inItem )
 
 void UMAAppendSubMenuItem( MenuRef menu , StringPtr l , SInt16 id ) 
 {
 
 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  ) 
 {
 }
 
 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 ;
 void UMAAppendMenuItem( MenuRef menu , StringPtr l , SInt16 key, UInt8 modifiers ) 
 {
        Str255 label ;