--- np2/macosx/toolwin.cpp	2004/03/02 23:23:06	1.18
+++ np2/macosx/toolwin.cpp	2004/05/23 04:07:56	1.20
@@ -203,9 +203,7 @@ const char		*p;
     bool		success = false;
     
     GetBevelButtonMenuHandle(hwnd, &menu);
-    while (MenuHasEnabledItems(menu)) {
-        DeleteMenuItem(menu, 1);
-    };
+	DeleteMenuItems(menu, 1, fdd->cnt);
 #if 0
 	GetControlBounds(hwnd, &rc);
 	width = rc.right - rc.left - 6;			// border size?
@@ -265,6 +263,9 @@ const char		*p;
     }
     else {
         SetControlTitleWithCFString(hwnd, CFSTR(" "));
+		for (i=0; i<fdd->cnt; i++) {
+			CheckMenuItem(menu, i+1, 0);
+		}
 	}
 }
 
@@ -1192,7 +1193,11 @@ const DISKACC	*accterm;
 // ----
 
 static const char ini_title[] = "NP2 tool";
+#if !defined(SUPPORT_PC9821)
 static const char inifile[] = "np2.cfg";			// same file name..
+#else
+static const char inifile[] = "np21.cfg";
+#endif
 
 static const INITBL iniitem[] = {
 	{"WindposX", INITYPE_SINT32,	&np2tool.posx,			0},