[frontierkernel-commits] Frontier/Common/source menu.c,1.6,1.7,

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

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

Modified Files:
	menu.c 
Log Message:
Switch to platform-agnostic code in deletemenuitems and disableallmenuitems.

Index: menu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menu.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** menu.c	20 Dec 2005 22:30:35 -0000	1.6
--- menu.c	19 Feb 2006 16:43:30 -0000	1.7
***************
*** 1675,1702 ****
  	/*
  	2005-10-01 creedon: created, delete menu items starting at firstitem for itemcount
  	*/
  
! 	boolean fl = true;
! 
! #ifdef MACVERSION
! 	fl = DeleteMenuItems (hmenu, firstitem, itemcount) == noErr;
! #endif
! 
! 	#ifdef WIN95VERSION
! 		register short ctitems = countmenuitems (hmenu);
! 		register short i;
! 		
! 		if (itemcount > ctitems)
! 			itemcount = ctitems;
! 		
! 		for (i = itemcount; i >= firstitem; i--)
! 			if (!deletemenuitem (hmenu, i)) {
! 				fl = false;
! 				break;
! 				}			
! 	#endif
  	
! 	return (fl);
  	
  	} /* deletemenuitems */
  
--- 1675,1695 ----
  	/*
  	2005-10-01 creedon: created, delete menu items starting at firstitem for itemcount
+ 	
+ 	2006-02-19 aradke: switched to platform-agnostic code
  	*/
  
! 	short ctitems = countmenuitems (hmenu);
! 	short i;
  	
! 	if (itemcount > ctitems)
! 		itemcount = ctitems;
  	
+ 	for (i = itemcount; i >= firstitem; i--) {
+ 		if (!deletemenuitem (hmenu, i)) {
+ 			return (false);
+ 			}			
+ 		} /*for*/
+ 		
+ 	return (true);
  	} /* deletemenuitems */
  
***************
*** 1706,1723 ****
  	/*
  	2005-10-01 creedon: created
  	*/
  
! #ifdef MACVERSION
! 	DisableAllMenuItems (hmenu);
! #endif
! 
! #ifdef WIN95VERSION
! 	register short ct = countmenuitems (hmenu);
! 	register short i;
  
  	for (i = ct; i > 0; i--)
  		disablemenuitem (hmenu, i);
- 
- #endif
  	
  	} /* disableallmenuitems */
--- 1699,1711 ----
  	/*
  	2005-10-01 creedon: created
+ 	
+ 	2006-02-19 aradke: switched to platform-agnostic code
  	*/
  
! 	short ct = countmenuitems (hmenu);
! 	short i;
  
  	for (i = ct; i > 0; i--)
  		disablemenuitem (hmenu, i);
  	
  	} /* disableallmenuitems */