--- np2/macosx/np2.cpp	2003/10/28 16:44:44	1.23
+++ np2/macosx/np2.cpp	2003/10/30 19:39:52	1.25
@@ -34,6 +34,7 @@
 #include	"macnewdisk.h"
 #include	"fdefine.h"
 #include	"hid.h"
+#include	"midiopt.h"
 
 #define	USE_RESUME
 #define	NP2OPENING
@@ -146,6 +147,9 @@ static void MenuBarInit(void) {
 	InsertMenu(GetMenu(IDM_KEYBOARD), -1);
 	InsertMenu(GetMenu(IDM_SOUND), -1);
 	InsertMenu(GetMenu(IDM_MEMORY), -1);
+    SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2OPEN, kMenuOptionModifier);
+    SetMenuItemModifiers(GetMenuRef(IDM_FDD2), IDM_FDD2EJECT, kMenuOptionModifier);
+    SetMenuItemModifiers(GetMenuRef(IDM_SASI2), IDM_SASI2OPEN, kMenuOptionModifier);
 	DrawMenuBar();
 #else
     OSStatus	err;
@@ -326,6 +330,10 @@ static void HandleMenuChoice(long wParam
             toggleMenubar();
 			break;
             
+        case IDM_MIDIOPT:
+            initMidiOpt();
+            break;
+            
 		case IDM_MIDIPANIC:
 			rs232c_midipanic();
 			mpu98ii_midipanic();
@@ -487,11 +495,9 @@ static void HandleMenuChoice(long wParam
 			dialog_writebmp();
 			break;
 
-#if 0
         case IDM_S98LOGGING:
-            menu_sets98logging(S98_logging());
+            dialog_s98();
             break;
-#endif
             
 		case IDM_DISPCLOCK:
 			menu_setdispclk(np2oscfg.DISPCLK ^ 1);
@@ -513,6 +519,11 @@ static void HandleMenuChoice(long wParam
 			update |= SYS_UPDATECFG;
 			break;
 
+        case IDM_MSRAPID:
+            menu_setmsrapid(np2cfg.MOUSERAPID ^ 1);
+            update |= SYS_UPDATECFG;
+            break;
+
 		case IDM_I286SAVE:
 			debugsub_status();
 			break;