--- np2/macosx/toolwin.cpp	2004/01/11 16:58:47	1.16
+++ np2/macosx/toolwin.cpp	2005/05/20 17:25:03	1.21
@@ -16,6 +16,7 @@
 #include	"pccore.h"
 #include	"iocore.h"
 
+extern void HandleMenuChoice(long wParam);
 
 enum {
 	IDC_TOOLHDDACC			= 0,
@@ -202,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?
@@ -224,7 +223,7 @@ const char		*p;
 				if (file_attr(p) != FILEATTR_ARCHIVE) {
 					attr |= kMenuItemAttrDisabled;
 				}
-				AppendMenuItemTextWithCFString(menu, str, attr, NULL, NULL);
+				AppendMenuItemTextWithCFString(menu, str, attr, 0, 0);
 			}
             CFRelease(str);
         }
@@ -264,6 +263,9 @@ const char		*p;
     }
     else {
         SetControlTitleWithCFString(hwnd, CFSTR(" "));
+		for (i=0; i<fdd->cnt; i++) {
+			CheckMenuItem(menu, i+1, 0);
+		}
 	}
 }
 
@@ -456,7 +458,7 @@ const char		*cls;
                     style = 1;
                     CreateBevelButtonControl(hWnd, &bounds,	CFSTRj(p->text), 
                                                         kControlBevelButtonSmallBevel,
-                                                        0 ,NULL, NULL, NULL, NULL, &sub);
+                                                        0 ,NULL, 0, 0, 0, &sub);
                     SetControlCommandID(sub, subcommand[i]);
                     SetControlFontStyle(sub, &fontstyle);
                     break;
@@ -528,7 +530,7 @@ static pascal OSStatus cfWinproc(EventHa
         switch (cmd.commandID)
         {
             case 'rset':
-                recieveCommand(IDM_RESET);
+                HandleMenuChoice(IDM_RESET);
                 err=noErr;
                 break;
                 
@@ -538,12 +540,12 @@ static pascal OSStatus cfWinproc(EventHa
                 break;
                                 
             case 'opn1':
-                recieveCommand(IDM_FDD1OPEN);
+                HandleMenuChoice(IDM_FDD1OPEN);
                 err=noErr;
                 break;
                 
             case 'ejt1':
-                recieveCommand(IDM_FDD1EJECT);
+                HandleMenuChoice(IDM_FDD1EJECT);
                 err=noErr;
                 break;
                 
@@ -553,17 +555,17 @@ static pascal OSStatus cfWinproc(EventHa
                 break;
                                 
             case 'opn2':
-                recieveCommand(IDM_FDD2OPEN);
+                HandleMenuChoice(IDM_FDD2OPEN);
                 err=noErr;
                 break;
                 
             case 'ejt2':
-                recieveCommand(IDM_FDD2EJECT);
+                HandleMenuChoice(IDM_FDD2EJECT);
                 err=noErr;
                 break;
                 
             case 'exit':
-                recieveCommand(IDM_EXIT);
+                HandleMenuChoice(IDM_EXIT);
                 err=noErr;
                 break;
                 
@@ -617,7 +619,7 @@ static pascal OSStatus cfWinproc(EventHa
                     EventRecord	eve;
                     ConvertEventRefToEventRecord( event,&eve );
                     mousemng_disable(MOUSEPROC_MACUI);
-                    recieveCommand(MenuEvent(&eve));
+                    HandleMenuChoice(MenuEvent(&eve));
                     mousemng_enable(MOUSEPROC_MACUI);
                 }
                 else {
@@ -855,11 +857,11 @@ const char	*base;
 	UINT	i;
     char	longname[256];
 
-	AppendMenuItemTextWithCFString(ret, CFCopyLocalizedString(CFSTR("Select Skin..."),"Slect Skin"), kMenuItemAttrIconDisabled, NULL,NULL);
+	AppendMenuItemTextWithCFString(ret, CFCopyLocalizedString(CFSTR("Select Skin..."),"Slect Skin"), kMenuItemAttrIconDisabled, 0, 0);
 	AppendMenu(ret, "\p-");
 
 	base = np2tool.skin;
-	AppendMenuItemTextWithCFString(ret, CFCopyLocalizedString(CFSTR("<Base Skin>"),"Base Skin"), kMenuItemAttrIconDisabled, NULL,NULL);
+	AppendMenuItemTextWithCFString(ret, CFCopyLocalizedString(CFSTR("<Base Skin>"),"Base Skin"), kMenuItemAttrIconDisabled, 0, 0);
 	if (base[0] == '\0') {
         CheckMenuItem(ret, BASENUMBER-1, true);
     }
@@ -876,7 +878,7 @@ const char	*base;
 		if (!getLongFileName(longname, p)) {
             strcpy(longname, file_getname(p));
         }
-        AppendMenuItemTextWithCFString(ret, CFStringCreateWithCString(NULL, longname, kCFStringEncodingUTF8), attr, NULL, NULL);
+        AppendMenuItemTextWithCFString(ret, CFStringCreateWithCString(NULL, longname, kCFStringEncodingUTF8), attr, 0, 0);
 	}
 	for (i=0; i<cnt; i++) {
         if (!file_cmpname(base, np2tool.skinmru[i])) {
@@ -924,7 +926,7 @@ static void openpopup(Point location) {
     InsertMenu(hMenu, -1);
 	createskinmenu(hMenu);
 	AppendMenu(hMenu, "\p-");
-    AppendMenuItemTextWithCFString(hMenu, CFCopyLocalizedString(CFSTR("Close"),"ToolWin Close"), kMenuItemAttrIconDisabled, NULL, NULL);
+    AppendMenuItemTextWithCFString(hMenu, CFCopyLocalizedString(CFSTR("Close"),"ToolWin Close"), kMenuItemAttrIconDisabled, 0, 0);
     DeleteMenu(222);
     selectclose = CountMenuItems(hMenu);
     sel = LoWord(PopUpMenuSelect(hMenu, location.v, location.h, 0));
@@ -936,7 +938,7 @@ static void openpopup(Point location) {
         switch (sel) {
             case 1:
                 if(dialog_fileselect(fname, sizeof(fname), hWndMain, OPEN_INI)) {
-                    if (file_getftype(fname)==FTYPE_TEXT) {
+                    if (file_getftype(fname)==FTYPE_INI) {
                         strcpy(np2tool.skin, fname);
                         skinchange(true);
                     }
@@ -1191,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},