--- np2/macosx/toolwin.cpp	2003/11/03 10:19:43	1.1
+++ np2/macosx/toolwin.cpp	2003/11/05 15:12:17	1.3
@@ -5,13 +5,16 @@
 #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"
 
+//for 10.2
+//#define	JAGUAR
+
 enum {
 	IDC_TOOLHDDACC			= 0,
 	IDC_TOOLFDD1ACC,
@@ -441,6 +444,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 +502,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 +573,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 +600,20 @@ static pascal OSErr DragReceiver( Window
 static WindowRef makeNibWindow (IBNibRef nibRef) {
     OSStatus	err;
     WindowRef	win = NULL;
-#if 0
+#ifndef JAGUAR
     Rect	bounds;
     SetRect(&bounds, 0, 0, 100, 100);
-    err = CreateNewWindow(kOverlayWindowClass, kWindowStandardHandlerAttribute, &bounds, &win);
+    err = CreateNewWindow(kFloatingWindowClass, kWindowStandardHandlerAttribute, &bounds, &win);
 #else
     err = CreateWindowFromNib(nibRef, CFSTR("ToolWindow"), &win);
 #endif
     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,6 +796,9 @@ void toolwin_open(void) {
 		goto twope_err2;
 	}
     
+#ifndef JAGUAR
+    toolwincreate(hWnd);
+#endif
     SizeWindow(hWnd, bounds.right-bounds.left, bounds.bottom-bounds.top, true);
     ControlButtonContentInfo	info;
     info.contentType = kControlContentPictHandle;
@@ -789,10 +806,12 @@ void toolwin_open(void) {
     CreatePictureControl(hWnd, &bounds, &info, true, &image);
     InstallControlEventHandler (image, NewEventHandlerUPP(cfControlproc), GetEventTypeCount(list), list, (void *)hWnd, &ref);
 
+#ifdef JAGUAR
     toolwincreate(hWnd);
+#endif
 
-#if 0
-    if (np2tool.posy < 30) np2tool.posy = 30;
+#ifndef JAGUAR
+    if (np2tool.posy < 35) np2tool.posy = 35;
     if (np2tool.posx < 5 ) np2tool.posx = 5;
     MoveWindow(hWnd, np2tool.posx, np2tool.posy, true);
     ShowWindow(hWnd);
@@ -816,7 +835,11 @@ twope_err1:
 void toolwin_close(void) {
 
     if (toolwin.hwnd) {
+#ifdef JAGUAR
         CloseDrawer(toolwin.hwnd, 0);
+#else
+        DisposeWindow(toolwin.hwnd);
+#endif
         RemoveReceiveHandler(dr, toolwin.hwnd);
         toolwindestroy();
         DisposeWindow(toolwin.hwnd);