[frontierkernel-commits] Frontier/Common/source cancoon.c,1.6,1.7, shellmenu.c,1.16,1.17,

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

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

Modified Files:
	cancoon.c shellmenu.c 
Log Message:
On Windows, don't include menu resources that aren't actually used by the application in order to avoid picking up their keyboard shortcuts.

Index: shellmenu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmenu.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** shellmenu.c	25 Feb 2006 15:11:57 -0000	1.16
--- shellmenu.c	25 Feb 2006 18:44:27 -0000	1.17
***************
*** 820,837 ****
  	x = (**hw).selectioninfo; /*get updated flags*/
  	
  	if (x.flcansetfont)
  		visitonemenu (fontmenu, &shellfontmenuchecker);
! 	
  	if (x.flcansetsize)
  		visitonemenu (sizemenu, &shellsizemenuchecker);
! 	
  	if (x.flcansetstyle)
  		visitonemenu (stylemenu, &shellstylemenuchecker);
! 	
  	if (x.flcansetleading)
  		visitonemenu (leadingmenu, &shellleadingmenuchecker);
! 	
  	if (x.flcansetjust)
  		visitonemenu (justifymenu, &shelljustifymenuchecker);
  	} /*shellcheckfontsizestyle*/
  
--- 820,847 ----
  	x = (**hw).selectioninfo; /*get updated flags*/
  	
+ #ifdef fontmenu
  	if (x.flcansetfont)
  		visitonemenu (fontmenu, &shellfontmenuchecker);
! #endif
! 
! #ifdef sizemenu	
  	if (x.flcansetsize)
  		visitonemenu (sizemenu, &shellsizemenuchecker);
! #endif
! 
! #ifdef stylemenu	
  	if (x.flcansetstyle)
  		visitonemenu (stylemenu, &shellstylemenuchecker);
! #endif
! 
! #ifdef leadingmenu	
  	if (x.flcansetleading)
  		visitonemenu (leadingmenu, &shellleadingmenuchecker);
! #endif
! 
! #ifdef justifymenu	
  	if (x.flcansetjust)
  		visitonemenu (justifymenu, &shelljustifymenuchecker);
+ #endif
  	} /*shellcheckfontsizestyle*/
  
***************
*** 1756,1759 ****
--- 1766,1770 ----
  			break;
  			
+ #ifdef sizemenu
  		case sizemenu: {
  			
***************
*** 1838,1842 ****
  			break;
  			} /*size menu*/
! 			
  		case stylemenu: {
  			
--- 1849,1855 ----
  			break;
  			} /*size menu*/
! #endif
! 
! #ifdef stylemenu			
  		case stylemenu: {
  			
***************
*** 1907,1911 ****
  			break;
  			} /*style menu*/
! 		
  		case justifymenu: {
  			
--- 1920,1926 ----
  			break;
  			} /*style menu*/
! #endif
! 
! #ifdef justifymenu		
  		case justifymenu: {
  			
***************
*** 1950,1954 ****
  			break;
  			} /*justify menu*/
! 			
  		case leadingmenu: {
  			
--- 1965,1971 ----
  			break;
  			} /*justify menu*/
! #endif
! 
! #ifdef leadingmenu			
  		case leadingmenu: {
  			
***************
*** 2027,2030 ****
--- 2044,2048 ----
  			break;
  			} /*leading menu*/
+ #endif
  		
  			case findandreplacemenu:
***************
*** 2410,2413 ****
--- 2428,2433 ----
  
  
+ #ifdef openrecentmenu
+ 
  static boolean openrecentmenuitemsvisit (bigstring bs, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) {
  
***************
*** 2429,2432 ****
--- 2449,2453 ----
  	} /* openrecentmenuitemsvisit */
  
+ #endif
  
  void shellupdateopenrecentmenu (void) {
***************
*** 2439,2442 ****
--- 2460,2465 ----
  	*/
  	
+ #ifdef openrecentmenu
+ 
  	bigstring bs;
  	boolean fl;
***************
*** 2466,2469 ****
--- 2489,2494 ----
  		disableallmenuitems (hmenu);
  
+ #endif
+ 
  	} /* shellupdateopenrecentmenu */
  

Index: cancoon.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/cancoon.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** cancoon.c	24 Jan 2005 02:56:57 -0000	1.6
--- cancoon.c	25 Feb 2006 18:44:27 -0000	1.7
***************
*** 1686,1690 ****
  	if ((idmenu == virtualmenu) && (ixmenu == helpitem))
  		return (!cchelpcommand ());
! 	
  	if (idmenu == newobjectmenu) {
  		
--- 1686,1691 ----
  	if ((idmenu == virtualmenu) && (ixmenu == helpitem))
  		return (!cchelpcommand ());
! 
! #ifdef newobjectmenu	
  	if (idmenu == newobjectmenu) {
  		
***************
*** 1693,1696 ****
--- 1694,1698 ----
  		return (false);
  		}
+ #endif
  	
  	#ifdef fldebug