--- xmil/macos9/xmil.cpp 2004/08/12 18:54:26 1.4 +++ xmil/macos9/xmil.cpp 2005/02/13 22:27:53 1.7 @@ -94,12 +94,11 @@ static void flagdelete(const char *ext) static int flagload(const char *ext, BRESULT force) { - int ret; char path[MAX_PATH]; char buf[1024]; int r; + int ret; - ret = IDOK; getstatfilename(path, ext, NELEMENTS(path)); r = statsave_check(path, buf, NELEMENTS(buf)); if (r & (~STATFLAG_DISKCHG)) { @@ -181,6 +180,13 @@ static void MenuBarInit(void) { } } +#if !defined(SUPPORT_TURBOZ) + hmenu = GetMenuHandle(IDM_IPLROM); + if (hmenu) { + DeleteMenuItem(hmenu, 3); + } +#endif + #if TARGET_API_MAC_CARBON hmenu = GetMenuHandle(IDM_FDD1); SetItemCmd(hmenu, LoWord(IDM_FDD1OPEN), 'D'); @@ -282,8 +288,8 @@ static void HandleMenuChoice(long wParam diskdrv_setfdd(3, NULL, 0); break; - case IDM_TURBOZ: - menu_setiplrom(3); + case IDM_X1ROM: + menu_setiplrom(1); update = SYS_UPDATECFG; break; @@ -292,10 +298,12 @@ static void HandleMenuChoice(long wParam update = SYS_UPDATECFG; break; - case IDM_X1ROM: - menu_setiplrom(1); +#if defined(SUPPORT_TURBOZ) + case IDM_TURBOZ: + menu_setiplrom(3); update = SYS_UPDATECFG; break; +#endif case IDM_BOOT2D: menu_setbootmedia(0); @@ -402,9 +410,9 @@ static void HandleMenuChoice(long wParam update = SYS_UPDATECFG; break; -// case IDM_BMPSAVE: -// dialog_writebmp(); -// break; + case IDM_BMPSAVE: + dialog_writebmp(); + break; case IDM_DISPCLOCK: menu_setdispclk(xmiloscfg.DISPCLK ^ 1); @@ -632,8 +640,10 @@ int main(int argc, char *argv[]) { // keystat_initialize(); SetRect(&wRect, xmiloscfg.posx, xmiloscfg.posy, 100, 100); - hWndMain = NewWindow(0, &wRect, "\pNekoe System", FALSE, + hWndMain = NewWindow(0, &wRect, "\pX millennium", FALSE, noGrowDocProc, (WindowPtr)-1, TRUE, 0); +// hWndMain = NewWindow(0, &wRect, "\pNekoe System", FALSE, +// noGrowDocProc, (WindowPtr)-1, TRUE, 0); if (!hWndMain) { TRACETERM(); macossub_term();