--- np2/macosx/np2.cpp 2004/05/23 04:07:56 1.62 +++ np2/macosx/np2.cpp 2005/05/20 17:25:03 1.65 @@ -40,6 +40,7 @@ #include "aboutdlg.h" #include "keystat.h" #include "subwind.h" +#include "macclnd.h" #define NP2OPENING // #define OPENING_WAIT 1500 @@ -189,15 +190,15 @@ static void MenuBarInit(void) { DisableMenuItem(GetMenuRef(IDM_OTHER), IDM_SOFTKBD); #endif if (np2oscfg.I286SAVE) { - AppendMenuItemTextWithCFString(GetMenuRef(IDM_OTHER), CFCopyLocalizedString(CFSTR("i286 save"),"i286"), kMenuItemAttrIconDisabled, NULL,NULL); + AppendMenuItemTextWithCFString(GetMenuRef(IDM_OTHER), CFCopyLocalizedString(CFSTR("i286 save"),"i286"), kMenuItemAttrIconDisabled, 0, 0); } #if defined(SUPPORT_PC9821) - AppendMenuItemTextWithCFString(GetMenuRef(IDM_MEMORY), CFSTR("11.6MB"), kMenuItemAttrIconDisabled, NULL, NULL); - AppendMenuItemTextWithCFString(GetMenuRef(IDM_MEMORY), CFSTR("13.6MB"), kMenuItemAttrIconDisabled, NULL, NULL); - SetMenuItemTextWithCFString(GetMenuRef(IDM_HELP), IDM_NP2HELP, CFSTR("Neko Project 21x Help")); - SetMenuItemTextWithCFString(GetMenuRef(IDM_APPLE), IDM_ABOUT, CFSTR("About Neko Project 21x...")); - SetMenuItemTextWithCFString(GetMenuRef(IDM_OTHER), IDM_I286SAVE, CFSTR("i386 save")); + AppendMenuItemTextWithCFString(GetMenuRef(IDM_MEMORY), CFSTR("11.6MB"), kMenuItemAttrIconDisabled, 0, NULL); + AppendMenuItemTextWithCFString(GetMenuRef(IDM_MEMORY), CFSTR("13.6MB"), kMenuItemAttrIconDisabled, 0, NULL); + SetMenuItemTextWithCFString(GetMenuRef(IDM_HELP), IDM_NP2HELP, CFCopyLocalizedString(CFSTR("Help"), "Help")); + SetMenuItemTextWithCFString(GetMenuRef(IDM_APPLE), IDM_ABOUT, CFCopyLocalizedString(CFSTR("About"), "About")); + SetMenuItemTextWithCFString(GetMenuRef(IDM_OTHER), IDM_I286SAVE, CFCopyLocalizedString(CFSTR("i386 save"), "save")); #endif if (!(np2cfg.fddequip & 1)) { @@ -664,6 +665,10 @@ void HandleMenuChoice(long wParam) { case IDM_S98LOGGING: dialog_s98(); break; + + case IDM_CALENDAR: + initClnd(); + break; case IDM_DISPCLOCK: menu_setdispclk(np2oscfg.DISPCLK ^ 1);