[frontierkernel-commits] Frontier/Common/resources/Win32 WinLand.rc,1.18,1.19,

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

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

Modified Files:
	WinLand.rc 
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: WinLand.rc
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/WinLand.rc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** WinLand.rc	23 Feb 2006 20:44:27 -0000	1.18
--- WinLand.rc	25 Feb 2006 18:44:27 -0000	1.19
***************
*** 366,369 ****
--- 366,370 ----
  #endif
  
+ #ifdef fontmenu
  fontmenu MENU DISCARDABLE
  BEGIN
***************
*** 373,377 ****
--- 374,380 ----
      END
  END
+ #endif
  
+ #ifdef stylemenu
  stylemenu MENU DISCARDABLE
  BEGIN
***************
*** 397,401 ****
--- 400,406 ----
      END
  END
+ #endif
  
+ #ifdef sizemenu
  sizemenu MENU DISCARDABLE
  BEGIN
***************
*** 415,419 ****
--- 420,426 ----
      END
  END
+ #endif
  
+ #ifdef leadingmenu
  leadingmenu MENU DISCARDABLE
  BEGIN
***************
*** 431,435 ****
--- 438,444 ----
      END
  END
+ #endif
  
+ #ifdef justifymenu
  justifymenu MENU DISCARDABLE
  BEGIN
***************
*** 442,446 ****
--- 451,457 ----
      END
  END
+ #endif
  
+ #ifdef newobjectmenu
  newobjectmenu MENU DISCARDABLE
  BEGIN
***************
*** 456,462 ****
--- 467,475 ----
      END
  END
+ #endif
  
  /*7.0b26 PBS: Find and Replace menu, Common Styles menu*/
  
+ #ifdef findandreplacemenu
  findandreplacemenu MENU DISCARDABLE
  BEGIN
***************
*** 469,473 ****
--- 482,488 ----
      END
  END
+ #endif
  
+ #ifdef commonstylesmenu
  commonstylesmenu MENU DISCARDABLE /* 2005-09-25 creedon */
  BEGIN
***************
*** 480,484 ****
--- 495,501 ----
      END
  END
+ #endif
  
+ #ifdef openrecentmenu
  openrecentmenu MENU DISCARDABLE /* 2005-09-25 creedon */
  BEGIN
***************
*** 489,492 ****
--- 506,510 ----
      END
  END
+ #endif
  
  
***************
*** 498,508 ****
  IDMULTIPAD ACCELERATORS MOVEABLE PURE
  BEGIN
- #ifndef PIKE
  	"O",			filemenu+openitem,			VIRTKEY, CONTROL, NOINVERT
- #endif
  	"W",			filemenu+closeitem,			VIRTKEY, CONTROL, NOINVERT
  	"S",			filemenu+saveitem,			VIRTKEY, CONTROL, NOINVERT
  #ifdef PIKE
! 	"P",			filemenu+viewinbrowseritem,		VIRTKEY, CONTROL, NOINVERT
  #endif
  	"Q",			filemenu+quititem,			VIRTKEY, CONTROL, NOINVERT
--- 516,528 ----
  IDMULTIPAD ACCELERATORS MOVEABLE PURE
  BEGIN
  	"O",			filemenu+openitem,			VIRTKEY, CONTROL, NOINVERT
  	"W",			filemenu+closeitem,			VIRTKEY, CONTROL, NOINVERT
  	"S",			filemenu+saveitem,			VIRTKEY, CONTROL, NOINVERT
  #ifdef PIKE
! 	"P",			filemenu+viewinbrowseritem,	VIRTKEY, CONTROL, NOINVERT
! 	"N",			filemenu+newitem,			VIRTKEY, CONTROL, NOINVERT
! #else
! 	"P",			filemenu+printitem,			VIRTKEY, CONTROL, NOINVERT
! 	"N",			newobjectmenu+1,			VIRTKEY, CONTROL, NOINVERT
  #endif
  	"Q",			filemenu+quititem,			VIRTKEY, CONTROL, NOINVERT
***************
*** 518,522 ****
  	"L",			virtualmenu+moveleftitem,	VIRTKEY, CONTROL, NOINVERT
  	"R",			virtualmenu+moverightitem,	VIRTKEY, CONTROL, NOINVERT
- 	"N",			newobjectmenu+1,			VIRTKEY, CONTROL, NOINVERT
      VK_BACK,        editmenu+undoitem,          VIRTKEY, ALT, NOINVERT
      VK_DELETE,      editmenu+cutitem,           VIRTKEY, SHIFT, NOINVERT
--- 538,541 ----