--- np2/macosx/sysmng.cpp	2003/10/28 16:44:44	1.5
+++ np2/macosx/sysmng.cpp	2004/05/23 04:07:56	1.12
@@ -1,14 +1,12 @@
 #include	"compiler.h"
 #include	"np2.h"
 #include	"dosio.h"
-#include	"i286.h"
 #include	"sysmng.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"fddfile.h"
 #include	"diskdrv.h"
 
-static bool getLongFileName(char* dst, const char* path);
-
 	UINT	sys_updates;
 
 
@@ -26,7 +24,7 @@ static struct {
 void sysmng_workclockreset(void) {
 
 	workclock.tick = GETTICK();
-	workclock.clock = I286_CLOCK;
+	workclock.clock = CPU_CLOCK;
 	workclock.draws = drawcount;
 }
 
@@ -41,8 +39,8 @@ BOOL sysmng_workclockrenewal(void) {
 	workclock.tick += tick;
 	workclock.fps = ((drawcount - workclock.draws) * 10000) / tick;
 	workclock.draws = drawcount;
-	workclock.khz = (I286_CLOCK - workclock.clock) / tick;
-	workclock.clock = I286_CLOCK;
+	workclock.khz = (CPU_CLOCK - workclock.clock) / tick;
+	workclock.clock = CPU_CLOCK;
 	return(TRUE);
 }
 
@@ -97,45 +95,25 @@ void sysmng_updatecaption(BYTE flag) {
 			milstr_ncat(strclock, work, sizeof(strclock));
 		}
 	}
+#if defined(NP2GCC)
+	milstr_ncpy(work, np2oscfg.titles, sizeof(work));
+#else
+#if !defined(SUPPORT_PC9821)
 	milstr_ncpy(work, "Neko Project II", sizeof(work));
+#else
+	milstr_ncpy(work, "Neko Project 21", sizeof(work));
+#endif
+#endif
 	milstr_ncat(work, strtitle, sizeof(work));
 	milstr_ncat(work, strclock, sizeof(work));
 
 #if defined(NP2GCC)
-    SetWindowTitleWithCFString(hWndMain, CFStringCreateWithCString(NULL, work, kCFStringEncodingUTF8));
+	CFStringRef cfstr;
+	cfstr = CFStringCreateWithCString(NULL, work, CFStringGetSystemEncoding());
+    SetWindowTitleWithCFString(hWndMain, cfstr);
+	CFRelease(cfstr);
 #else
 	mkstr255(str, work);
 	SetWTitle(hWndMain, str);
 #endif
 }
-
-static bool getLongFileName(char* dst, const char* path) {
-	FSSpec	fss;
-	Str255	fname;
-    FSRef	fref;
-    char	buffer[1024];
-	char 	*ret, *val;
-
-    if (*path == '\0') {
-        return(false);
-    }
-	mkstr255(fname, path);
-	if (FSMakeFSSpec(0, 0, fname, &fss) != noErr) {
-        return(false);
-    }
-    if (FSpMakeFSRef(&fss, &fref) != noErr) {
-        return(false);
-    }
-    if (FSRefMakePath(&fref, (UInt8*)buffer, 1024) != noErr) {
-        return(false);
-    }
-	val = buffer;
-    ret = val;
-	while(*val != '\0') {
- 		if (*val++ == '/') {
-			ret = val;
-		}
-	}
-    strcpy(dst, ret);
-    return(true);
-}
\ No newline at end of file