|
From: Andre R. <and...@us...> - 2006-02-25 17:11:21
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22126 Modified Files: menubar.c Log Message: On Windows, the menu with the highest id can be a main menu or a hierarchic (sub)menu. Deal with it. Index: menubar.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menubar.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** menubar.c 11 Jan 2005 22:48:09 -0000 1.4 --- menubar.c 25 Feb 2006 17:11:14 -0000 1.5 *************** *** 74,78 **** #ifdef WIN95VERSION ! #define defaultbasemenuid ((lastmainmenu / hiermenuincrement) + 1) #endif --- 74,82 ---- #ifdef WIN95VERSION ! /* ! 2006-02-25 aradke: on windows, the menu with the highest id can be ! a main menu or a hierarchic (sub)menu. deal with it. ! */ ! #define defaultbasemenuid ((max(lastmainmenu, lasthiermenu) / hiermenuincrement) + 1) #endif |