--- np2/win9xc/np2.cpp	2003/11/06 01:58:36	1.8
+++ np2/win9xc/np2.cpp	2003/12/08 06:24:03	1.12
@@ -1,6 +1,8 @@
 #include	"compiler.h"
 #include	<time.h>
+#ifndef __GNUC__
 #include	<winnls32.h>
+#endif
 #include	"strres.h"
 #include	"parts.h"
 #include	"resource.h"
@@ -45,9 +47,13 @@
 #define	STATSAVEMAX		10
 
 static	char		np2help[] = "np2.hlp";
-static	char		np2resume[] = "sav";
+// static char		np2resume[] = "sav";
 
-static	const char	szAppCaption[] = "Neko Project II - C version";
+#if defined(CPUCORE_IA32)
+		const char szAppCaption[] = "Neko Project II (IA-32)";
+#else
+		const char szAppCaption[] = "Neko Project II (C Version)";
+#endif
 static	const char	szClassName[] = "NP2-MainWindow";
 
 
@@ -133,8 +139,9 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 
 	switch (msg) {
 		case WM_CREATE:
+#ifndef __GNUC__
 			WINNLSEnableIME(hWnd, FALSE);
-//			DragAcceptFiles(hWnd, TRUE);
+#endif
 			break;
 
 		case WM_SYSCOMMAND:
@@ -300,47 +307,53 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT
 
 				case IDM_KEY:
 					xmenu_setkey(0);
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_JOY1:
 					xmenu_setkey(1);
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_JOY2:
 					xmenu_setkey(2);
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_XSHIFT:
 					xmenu_setxshift(np2cfg.XSHIFT ^ 1);
 					keystat_forcerelease(0x70);
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_XCTRL:
 					xmenu_setxshift(np2cfg.XSHIFT ^ 2);
 					keystat_forcerelease(0x74);
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_XGRPH:
 					xmenu_setxshift(np2cfg.XSHIFT ^ 4);
 					keystat_forcerelease(0x73);
+					update |= SYS_UPDATECFG;
 					break;
 
 				case IDM_F12MOUSE:
 					xmenu_setf12copy(0);
 					keystat_resetcopyhelp();
-					update |= SYS_UPDATECFG;
+					update |= SYS_UPDATEOSCFG;
 					break;
 
 				case IDM_F12COPY:
 					xmenu_setf12copy(1);
 					keystat_resetcopyhelp();
-					update |= SYS_UPDATECFG;
+					update |= SYS_UPDATEOSCFG;
 					break;
 
 				case IDM_F12STOP:
 					xmenu_setf12copy(2);
 					keystat_resetcopyhelp();
-					update |= SYS_UPDATECFG;
+					update |= SYS_UPDATEOSCFG;
 					break;
 
 				case IDM_BEEPOFF:
@@ -796,7 +809,7 @@ int WINAPI WinMain(HINSTANCE hInstance, 
 		np2.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON1));
 		np2.hCursor = LoadCursor(NULL, IDC_ARROW);
 		np2.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH);
-		np2.lpszMenuName = MAKEINTRESOURCE(IDM_MAIN);
+		np2.lpszMenuName = MAKEINTRESOURCE(IDR_MAIN);
 		np2.lpszClassName = szClassName;
 		if (!RegisterClass(&np2)) {
 			return(FALSE);