--- np2/macosx/toolwin.cpp	2003/11/03 10:19:43	1.1
+++ np2/macosx/toolwin.cpp	2003/11/05 16:08:59	1.4
@@ -5,13 +5,14 @@
 #include	"dosio.h"
 #include	"ini.h"
 #include	"resource.h"
-#include	"toolmac.h"
+#include	"toolwin.h"
 #include	"np2opening.h"
 #include	"dialogutils.h"
 #include	"dialog.h"
 #include	"soundmng.h"
 #include	"fdefine.h"
 
+
 enum {
 	IDC_TOOLHDDACC			= 0,
 	IDC_TOOLFDD1ACC,
@@ -114,6 +115,16 @@ static DragReceiveHandlerUPP	dr;
 
 // ----
 
+static bool isPuma(void) {
+    long	res;
+    Gestalt(gestaltSystemVersion, &res);
+    if (res<0x1020) {
+        return(true);
+    }
+    return(false);
+}
+
+
 static PicHandle skinload(const char *path, Rect* bounds) {
 
 	char		fname[MAX_PATH];
@@ -441,6 +452,8 @@ static void toolwindestroy(void) {
 static pascal OSStatus cfWinproc(EventHandlerCallRef myHandler, EventRef event, void* userData) {
     OSStatus	err = eventNotHandledErr;
     HICommand	cmd;
+    ControlRef	sub;
+    int			i;
 
     if (GetEventClass(event)==kEventClassCommand && GetEventKind(event)==kEventCommandProcess ) {
         GetEventParameter(event, kEventParamDirectObject, typeHICommand, NULL, sizeof(HICommand), NULL, &cmd);
@@ -497,6 +510,17 @@ static pascal OSStatus cfWinproc(EventHa
                 err=noErr;
                 break;
                 
+            case kEventWindowDrawContent:
+            case kEventWindowShown:
+                for (i=0; i<IDC_MAXITEMS; i++) {
+                    sub = toolwin.sub[i];
+                    if (sub) {
+                        Draw1Control(sub);
+                    }
+                }
+                break;
+
+                
             default:
                 break;
         }
@@ -557,28 +581,23 @@ static pascal OSErr DragReceiver( Window
         }
     }
 
-	// アイテムは１つだけか？
 	UInt16 numItems;
     CountDragItems( theDrag, &numItems );
 	if ( numItems != 1 )
-	{							// 複数ある
-		return( -1 );			// 取り扱わない
-	}
+	{
+		return( -1 );
+    }
 
-	// アイテムリファレンスを取り出す
 	DragItemRef ItemRef;
 	GetDragItemReferenceNumber( theDrag, 1, &ItemRef );
     
-	// フレーバタイプを調べる
 	FlavorType Type;
 	GetFlavorType( theDrag, ItemRef, 1, &Type );
-	// ファイルか？
 	if ( Type != flavorTypeHFS )
-	{							// ファイルではない
-		return( -1 );			// 取り扱わない
-	}
+	{
+        return( -1 );
+    }
 
-	// FSSpecを得る
 	HFSFlavor aHFSFlavor;
 	Size dataSize = sizeof(aHFSFlavor);
 	GetFlavorData( theDrag, ItemRef, flavorTypeHFS, &aHFSFlavor, &dataSize, 0 );
@@ -589,17 +608,22 @@ static pascal OSErr DragReceiver( Window
 static WindowRef makeNibWindow (IBNibRef nibRef) {
     OSStatus	err;
     WindowRef	win = NULL;
-#if 0
-    Rect	bounds;
-    SetRect(&bounds, 0, 0, 100, 100);
-    err = CreateNewWindow(kOverlayWindowClass, kWindowStandardHandlerAttribute, &bounds, &win);
-#else
-    err = CreateWindowFromNib(nibRef, CFSTR("ToolWindow"), &win);
-#endif
+
+    if (isPuma()) {
+        Rect	bounds;
+        SetRect(&bounds, 0, 0, 100, 100);
+        err = CreateNewWindow(kFloatingWindowClass, kWindowStandardHandlerAttribute, &bounds, &win);
+    }
+    else {
+        err = CreateWindowFromNib(nibRef, CFSTR("ToolWindow"), &win);
+    }
     if (err == noErr) {
+        InstallStandardEventHandler(GetWindowEventTarget(win));
         EventTypeSpec	list[]={ 
             { kEventClassCommand, kEventCommandProcess },
             { kEventClassWindow, kEventWindowClose }, 
+            { kEventClassWindow, kEventWindowShown }, 
+            { kEventClassWindow, kEventWindowDrawContent }, 
         };
         EventHandlerRef	ref;
         InstallWindowEventHandler (win, NewEventHandlerUPP(cfWinproc), GetEventTypeCount(list), list, (void *)win, &ref);
@@ -782,26 +806,31 @@ void toolwin_open(void) {
 		goto twope_err2;
 	}
     
+    if (isPuma()) {
+        toolwincreate(hWnd);
+    }
     SizeWindow(hWnd, bounds.right-bounds.left, bounds.bottom-bounds.top, true);
     ControlButtonContentInfo	info;
     info.contentType = kControlContentPictHandle;
     info.u.picture = hbmp;
     CreatePictureControl(hWnd, &bounds, &info, true, &image);
     InstallControlEventHandler (image, NewEventHandlerUPP(cfControlproc), GetEventTypeCount(list), list, (void *)hWnd, &ref);
+    if (!isPuma()) {
+        toolwincreate(hWnd);
+    }
 
-    toolwincreate(hWnd);
-
-#if 0
-    if (np2tool.posy < 30) np2tool.posy = 30;
-    if (np2tool.posx < 5 ) np2tool.posx = 5;
-    MoveWindow(hWnd, np2tool.posx, np2tool.posy, true);
-    ShowWindow(hWnd);
-#else
-    SetDrawerParent(hWnd, hWndMain);
-    SetDrawerOffsets(hWnd, (640-(bounds.right-bounds.left))/2-11, (640-(bounds.right-bounds.left))/2-11);
-    SetDrawerPreferredEdge(hWnd, kWindowEdgeTop);
-    OpenDrawer(hWnd, kWindowEdgeDefault, 1);
-#endif
+    if (isPuma()) {
+        if (np2tool.posy < 35) np2tool.posy = 35;
+        if (np2tool.posx < 5 ) np2tool.posx = 5;
+        MoveWindow(hWnd, np2tool.posx, np2tool.posy, true);
+        ShowWindow(hWnd);
+    }
+    else{
+        SetDrawerParent(hWnd, hWndMain);
+        SetDrawerOffsets(hWnd, (640-(bounds.right-bounds.left))/2-11, (640-(bounds.right-bounds.left))/2-11);
+        SetDrawerPreferredEdge(hWnd, kWindowEdgeTop);
+        OpenDrawer(hWnd, kWindowEdgeDefault, 1);
+    }
 
 	return;
 
@@ -816,7 +845,12 @@ twope_err1:
 void toolwin_close(void) {
 
     if (toolwin.hwnd) {
-        CloseDrawer(toolwin.hwnd, 0);
+        if (!isPuma()) {
+            CloseDrawer(toolwin.hwnd, 0);
+        }
+        else{
+            DisposeWindow(toolwin.hwnd);
+        }
         RemoveReceiveHandler(dr, toolwin.hwnd);
         toolwindestroy();
         DisposeWindow(toolwin.hwnd);