--- np2/win9x/debuguty/viewer.cpp	2003/10/21 11:22:05	1.2
+++ np2/win9x/debuguty/viewer.cpp	2005/02/04 05:32:25	1.5
@@ -3,10 +3,11 @@
 #include	"np2.h"
 #include	"viewer.h"
 #include	"viewcmn.h"
-#include	"i286.h"
+#include	"cpucore.h"
 
 
-static	char		np2viewclass[] = "NP2-ViewWindow";
+static	const char	np2viewclass[] = "NP2-ViewWindow";
+		const char	np2viewfont[] = "£Í£Ó ¥´¥·¥Ã¥¯";
 		NP2VIEW_T	np2view[NP2VIEW_MAX];
 extern	HINSTANCE	hInst;
 
@@ -202,7 +203,7 @@ BOOL viewer_init(HINSTANCE hPreInst) {
 		np2vc.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON2));
 		np2vc.hCursor = LoadCursor(NULL, IDC_ARROW);
 		np2vc.hbrBackground = (HBRUSH)0;
-		np2vc.lpszMenuName = MAKEINTRESOURCE(IDM_VIEW);
+		np2vc.lpszMenuName = MAKEINTRESOURCE(IDR_VIEW);
 		np2vc.lpszClassName = np2viewclass;
 		if (!RegisterClass(&np2vc)) {
 			return(FAILURE);
@@ -275,8 +276,8 @@ static	DWORD	last = 0;
 		for (i=0; i<NP2VIEW_MAX; i++, view++) {
 			if ((view->alive) && (!view->lock)) {
 				if (view->type == VIEWMODE_ASM) {
-					view->seg = I286_CS;
-					view->off = I286_IP;
+					view->seg = CPU_CS;
+					view->off = CPU_IP;
 					view->pos = 0;
 					viewcmn_setvscroll(view->hwnd, view);
 				}