diff -ur ooo_SRC680_m179_src.orig/vcl/aqua/inc/salmenu.h ooo_SRC680_m179_src/vcl/aqua/inc/salmenu.h --- ooo_SRC680_m179_src.orig/vcl/aqua/inc/salmenu.h 2006-07-28 18:10:25.000000000 +0200 +++ ooo_SRC680_m179_src/vcl/aqua/inc/salmenu.h 2006-07-28 18:19:50.000000000 +0200 @@ -74,10 +74,8 @@ CFStringRef mText; // Title of this menu MenuRef mrMenuRef; // The Carbon reference to this menu - MenuID mnMenuID; // The MenuID of this menu - - BOOL mbMenuBar; // TRUE - Menubar - // FALSE - Menu + BOOL mbMenuBar; // TRUE - Menubar + // FALSE - Menu }; class AquaSalMenuItem : public SalMenuItem diff -ur ooo_SRC680_m179_src.orig/vcl/aqua/source/window/salmenu.cxx ooo_SRC680_m179_src/vcl/aqua/source/window/salmenu.cxx --- ooo_SRC680_m179_src.orig/vcl/aqua/source/window/salmenu.cxx 2006-07-28 18:10:26.000000000 +0200 +++ ooo_SRC680_m179_src/vcl/aqua/source/window/salmenu.cxx 2006-07-28 18:22:20.000000000 +0200 @@ -52,15 +52,11 @@ fprintf(stderr, "PJ: AquaSalInstance::CreateMenu(%d)\n", bMenuBar); AquaSalMenu *pAquaSalMenu = new AquaSalMenu(); + static MenuID inMenuID=0; pAquaSalMenu->mbMenuBar = bMenuBar; - // FIXME: any other solution for MenuIDs for CreateNewMenu? - // Do we need to store it at all? - static MenuID inMenuID=0; - pAquaSalMenu->mnMenuID = inMenuID++; - - CreateNewMenu (pAquaSalMenu->mnMenuID, 0, &pAquaSalMenu->mrMenuRef); + CreateNewMenu (inMenuID++, 0, &pAquaSalMenu->mrMenuRef); /* Associate the pointer to this SalMenu with the menu */ fprintf(stderr, "PJ: Associating %p, 0 = %p\n", pAquaSalMenu->mrMenuRef, pAquaSalMenu);