[frontierkernel-commits] Frontier/Common/source shellmenu.c,1.12,1.13, shellmouse.c,1.7,1.8,

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

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

Modified Files:
	shellmenu.c shellmouse.c 
Log Message:
Enable Open Recent sub-menu in File menu of Frontier/Win32.

Index: shellmenu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmenu.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** shellmenu.c	8 Feb 2006 20:07:42 -0000	1.12
--- shellmenu.c	11 Feb 2006 14:40:34 -0000	1.13
***************
*** 1173,1179 ****
  	enablemenuitem (hmenu, openitem);
  	
- #ifndef OPMLEDITOR
  	enablemenuitem (hmenu, openrecentitem);
- #endif // OPMLEDITOR
  	
  	setmenuitemenable (hmenu, closeitem, flwindow);
--- 1173,1177 ----
***************
*** 1476,1479 ****
--- 1474,1481 ----
  	
  	shellupdatewindowmenu ();
+ 	
+ #ifndef PIKE
+ 	shellupdateopenrecentmenu ();	/* 2006-02-11 aradke */
+ #endif
  	} /*shellupdatemenus*/
  	
***************
*** 1482,1494 ****
  
  	/*
! 	2005-12-31 creedon: for host databases that don't have a Frontier.tools table, provide some of the basic file commands so that folks can work
! 						with databases
  	
  	2005-09-25 creedon: changed so that all targets can call scripts for some file/edit menu commands
  					 added open recent menu
  	
! 	7.0d6 PBS: With Pike's now-standard File menu, it's necessary to use kernel routines for New and Open. Run scripts in Pike for everything else.
  
! 	5/19/93 dmb: closefunc uses getfrontwindow, not shellwindow
  	*/
  	
--- 1484,1498 ----
  
  	/*
! 	5/19/93 dmb: closefunc uses getfrontwindow, not shellwindow
! 
! 	7.0d6 PBS: With Pike's now-standard File menu, it's necessary to use kernel routines for New and Open. Run scripts in Pike for everything else.
  	
  	2005-09-25 creedon: changed so that all targets can call scripts for some file/edit menu commands
  					 added open recent menu
  	
! 	2005-12-31 creedon: for host databases that don't have a Frontier.tools table, provide some of the basic file commands so that folks can work
! 						with databases
  
! 	2006-02-11 aradke: enable open recent menu on win32
  	*/
  	
***************
*** 2036,2051 ****
  			} /* virtual menu */
  
! 		case openrecentmenu: {
  		
! 			boolean flkernelhandledcommand = false;
  		
! 			if (!flkernelhandledcommand) /* run the script if special cases weren't handled above */
! 
! 				runopenrecentmenuscript (iditem);
  				
  			break;
  			} /* openrecentmenu */
  
! 		#endif
  
  	#ifdef WIN95VERSION
--- 2040,2055 ----
  			} /* virtual menu */
  
! 		#endif	//MACVERSION
! 
! 		#ifndef PIKE
  		
! 		case openrecentmenu: {
  		
! 			runopenrecentmenuscript (iditem);	/* 2006-02-11 aradke */
  				
  			break;
  			} /* openrecentmenu */
  
! 		#endif	//!PIKE
  
  	#ifdef WIN95VERSION
***************
*** 2432,2436 ****
  	if (countmenuitems (hmenu) == 2)
  		disableallmenuitems (hmenu);
! 		
! 	}
  
--- 2436,2440 ----
  	if (countmenuitems (hmenu) == 2)
  		disableallmenuitems (hmenu);
! 
! 	} /* shellupdateopenrecentmenu */
  

Index: shellmouse.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmouse.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shellmouse.c	5 Feb 2006 16:05:04 -0000	1.7
--- shellmouse.c	11 Feb 2006 14:40:34 -0000	1.8
***************
*** 405,413 ****
  		
  		case inMenuBar: 
- #if TARGET_API_MAC_CARBON == 1
- #ifndef OPMLEDITOR
- 			shellupdateopenrecentmenu (); /* 2005-09-25 creedon */
- #endif
- #endif
  
  			shellupdatemenus (); /*be sure the menus are properly checked and highlighted*/
--- 405,408 ----