--- np2/win9x/menu.cpp	2004/03/24 06:07:57	1.15
+++ np2/win9x/menu.cpp	2004/04/08 13:08:22	1.18
@@ -81,7 +81,12 @@ const MENUITEMS *iterm;
 
 static const MENUITEMS smenuitem[] = {
 			{IDM_TOOLWIN,		IDS_TOOLWIN},
+#if defined(SUPPORT_KEYDISP)
 			{IDM_KEYDISP,		IDS_KEYDISP},
+#endif
+#if defined(SUPPORT_SOFTKBD)
+			{IDM_SOFTKBD,		IDS_SOFTKBD},
+#endif
 			{0,					0},
 			{IDM_SCREENCENTER,	IDS_SCREENCENTER},
 			{IDM_SNAPENABLE,	IDS_SNAPENABLE},
@@ -97,8 +102,12 @@ static const MENUITEMS smenuitem[] = {
 			{0,					0}};
 
 static const MENUITEMS smenuitem2[] = {
+#if defined(CPUCORE_IA32) && defined(SUPPORT_MEMDBG32)
+			{IDM_MEMDBG32,		IDS_MEMDBG32},
+#endif
 			{IDM_MEMORYDUMP,	IDS_MEMORYDUMP},
-			{IDM_DEBUGUTY,		IDS_DEBUGUTY}};
+			{IDM_DEBUGUTY,		IDS_DEBUGUTY},
+			{0,					0}};
 
 
 void sysmenu_initialize(void) {
@@ -108,7 +117,7 @@ void sysmenu_initialize(void) {
 	hMenu = GetSystemMenu(hWndMain, FALSE);
 	insertresmenus(hMenu, 0, smenuitem, sizeof(smenuitem)/sizeof(MENUITEMS));
 	if (np2oscfg.I286SAVE) {
-		insertresmenus(hMenu, 7, smenuitem2,
+		insertresmenus(hMenu, 0, smenuitem2,
 										sizeof(smenuitem2)/sizeof(MENUITEMS));
 	}
 }
@@ -442,6 +451,8 @@ void xmenu_setextmem(BYTE value) {
 	CheckMenuItem(hmenu, IDM_MEM16, MFCHECK(value == 1));
 	CheckMenuItem(hmenu, IDM_MEM36, MFCHECK(value == 3));
 	CheckMenuItem(hmenu, IDM_MEM76, MFCHECK(value == 7));
+	CheckMenuItem(hmenu, IDM_MEM116, MFCHECK(value == 11));
+	CheckMenuItem(hmenu, IDM_MEM136, MFCHECK(value == 13));
 }
 
 void xmenu_setmouse(BYTE value) {
@@ -451,11 +462,21 @@ void xmenu_setmouse(BYTE value) {
 	CheckMenuItem(np2class_gethmenu(hWndMain), IDM_MOUSE, MFCHECK(value));
 }
 
+#if defined(SUPPORT_S98)
 void xmenu_sets98logging(BYTE value) {
 
 	CheckMenuItem(np2class_gethmenu(hWndMain),
 											IDM_S98LOGGING, MFCHECK(value));
 }
+#endif
+
+#if defined(SUPPORT_WAVEREC)
+void xmenu_setwaverec(BYTE value) {
+
+	CheckMenuItem(np2class_gethmenu(hWndMain),
+											IDM_WAVEREC, MFCHECK(value));
+}
+#endif
 
 void xmenu_setshortcut(BYTE value) {