[frontierkernel-commits] Frontier/Common/headers shellmenu.h,1.6,1.7,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23022

Modified Files:
	shellmenu.h 
Log Message:
Reorganized numbering of main menus and hierarchic menus on Windows. This change will break the OPML Editor build temporarily.

Index: shellmenu.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellmenu.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shellmenu.h	12 Feb 2006 11:26:16 -0000	1.6
--- shellmenu.h	25 Feb 2006 17:13:26 -0000	1.7
***************
*** 43,50 ****
  
  	#define applemenu firstmainmenu
- 
  	#define filemenu (applemenu + mainmenuincrement)
  	#define editmenu (filemenu + mainmenuincrement)
  	#define windowsmenu (editmenu + mainmenuincrement)
  	#define fontmenu firsthiermenu
  	#define stylemenu (fontmenu + hiermenuincrement)
--- 43,50 ----
  
  	#define applemenu firstmainmenu
  	#define filemenu (applemenu + mainmenuincrement)
  	#define editmenu (filemenu + mainmenuincrement)
  	#define windowsmenu (editmenu + mainmenuincrement)
+ 
  	#define fontmenu firsthiermenu
  	#define stylemenu (fontmenu + hiermenuincrement)
***************
*** 57,87 ****
  	#define virtualmenu (newobjectmenu + hiermenuincrement) /* never appears in user interface -- used for externed keyboard */
  	#define openrecentmenu ((virtualmenu + hiermenuincrement))
! #endif
  
  #ifdef WIN95VERSION
- 	#define firstmainmenu 2000
- 	#define firsthiermenu 3100
  	#define mainmenuincrement 1000
  	#define hiermenuincrement 100
  
! 	#define applemenu 1000
  
! 	// under windows, we can't use expressions for the menu #defines; the .rc compiler chokes
! 	#define filemenu 2000
! 	#define editmenu 3000
! 	#define windowsmenu 4000
! 	#define helpmenu 5000
! 	#define fontmenu firsthiermenu
! 	#define stylemenu 3200
! 	#define sizemenu 3300
! 	#define leadingmenu 3400
! 	#define justifymenu 3500
! 	#define findandreplacemenu 3600
! 	#define virtualmenu 4100
! 	#define commonstylesmenu 3700 /*7.0b26 PBS*/
! 	#define newobjectmenu 3800
! 	#define openrecentmenu 3900		/* 2006-02-05 aradke */
  
- #endif
  
  #define aboutitem 1
--- 57,111 ----
  	#define virtualmenu (newobjectmenu + hiermenuincrement) /* never appears in user interface -- used for externed keyboard */
  	#define openrecentmenu ((virtualmenu + hiermenuincrement))
! 
! 	#define lastmainmenu windowsmenu
! 	#define lasthiermenu openrecentmenu
! #endif //MACVERSION
! 
  
  #ifdef WIN95VERSION
  	#define mainmenuincrement 1000
  	#define hiermenuincrement 100
  
! 	#define applemenu			1000
! 	#define filemenu			2000
! 	#define editmenu			3000
! 	#define windowsmenu			4000
! 	#define helpmenu			5000
  
! 	#define firstmainmenu		filemenu
! 	#define lastmainmenu		helpmenu
! 
! #ifdef PIKE
! 	#undef stylemenu
! 	#undef leadingmenu
! 	#undef justifymenu
! 	#undef newobjectmenu
! 	#undef openrecentmenu
! 
! 	#define virtualmenu			5100	/* 2006-02-25 aradke: never actually displayed */
! 	#define fontmenu			5200
! 	#define sizemenu			5300
! 	#define findandreplacemenu	5400
! 	#define commonstylesmenu	5500	/*7.0b26 PBS*/
! 
! 	#define firsthiermenu		fontmenu
! 	#define lasthiermenu		commonstylesmenu
! #else //!PIKE
! 	#define virtualmenu			5100	/* 2006-02-25 aradke: never actually displayed */
! 	#define fontmenu			5200
! 	#define stylemenu			5300
! 	#define sizemenu			5400
! 	#define leadingmenu			5500
! 	#define justifymenu			5600
! 	#define findandreplacemenu	5700
! 	#define commonstylesmenu	5800	/*7.0b26 PBS*/
! 	#define newobjectmenu		5900
! 	#define openrecentmenu		6000	/* 2006-02-05 aradke */
! 
! 	#define firsthiermenu		fontmenu
! 	#define lasthiermenu		openrecentmenu
! #endif //!PIKE
! #endif //WIN95VERSION
  
  
  #define aboutitem 1
***************
*** 207,212 ****
  #define aboutitem 1
  
- #define fontmenu firsthiermenu
- 
  // #define stylemenu (fontmenu + hiermenuincrement)
  #define plainitem 1
--- 231,234 ----
***************
*** 263,277 ****
  
  
! #ifdef MACVERSION
! 	#define lastmainmenu windowsmenu
! 	#define lasthiermenu openrecentmenu
! #endif
! #ifdef WIN95VERSION
! 	#define lastmainmenu helpmenu
! 	#define lasthiermenu openrecentmenu
! #endif
! 
! 
! #define ctmenustack (lastmainmenu - firstmainmenu + lasthiermenu - firsthiermenu + 2)
  
  typedef struct tymenuinfo {
--- 285,292 ----
  
  
! //#define ctmenustack (lastmainmenu - firstmainmenu + lasthiermenu - firsthiermenu + 2)
! #define ctmenustack ( (lastmainmenu - firstmainmenu) / mainmenuincrement \
! 					+ (lasthiermenu - firsthiermenu) / hiermenuincrement \
! 					+ 2)
  
  typedef struct tymenuinfo {