--- np2/win9x/debuguty/viewseg.cpp	2003/10/16 17:59:10	1.1.1.1
+++ np2/win9x/debuguty/viewseg.cpp	2005/02/04 05:32:25	1.4
@@ -1,12 +1,12 @@
 #include	"compiler.h"
 #include	"resource.h"
 #include	"np2.h"
-#include	"i286.h"
 #include	"viewer.h"
 #include	"viewcmn.h"
 #include	"viewmenu.h"
 #include	"viewmem.h"
 #include	"viewseg.h"
+#include	"cpucore.h"
 
 
 static void set_viewseg(HWND hwnd, NP2VIEW_T *view, WORD seg) {
@@ -31,7 +31,7 @@ static void viewseg_paint(NP2VIEW_T *vie
 
 	hfont = CreateFont(16, 0, 0, 0, 0, 0, 0, 0, 
 					SHIFTJIS_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS,
-					DEFAULT_QUALITY, FIXED_PITCH, "£Í£Ó¥´¥·¥Ã¥¯");
+					DEFAULT_QUALITY, FIXED_PITCH, np2viewfont);
 	SetTextColor(hdc, 0xffffff);
 	SetBkColor(hdc, 0x400000);
 	hfont = (HFONT)SelectObject(hdc, hfont);
@@ -87,19 +87,19 @@ LRESULT CALLBACK viewseg_proc(NP2VIEW_T 
 		case WM_COMMAND:
 			switch(LOWORD(wp)) {
 				case IDM_SEGCS:
-					set_viewseg(hwnd, view, I286_CS);
+					set_viewseg(hwnd, view, CPU_CS);
 					break;
 
 				case IDM_SEGDS:
-					set_viewseg(hwnd, view, I286_DS);
+					set_viewseg(hwnd, view, CPU_DS);
 					break;
 
 				case IDM_SEGES:
-					set_viewseg(hwnd, view, I286_ES);
+					set_viewseg(hwnd, view, CPU_ES);
 					break;
 
 				case IDM_SEGSS:
-					set_viewseg(hwnd, view, I286_SS);
+					set_viewseg(hwnd, view, CPU_SS);
 					break;
 
 				case IDM_SEGTEXT: