*** Mac only ***

xpinstall/wizard/mac/src/CheckboxLDEF.c

@@ -100,9 +100,9 @@ DrawCheckedCheckbox(Rect *cellRect)
 	
 	/* now fill in check mark */
 	
-	MoveTo(checkbox.left, checkbox.top);
-	LineTo(checkbox.right-1, checkbox.bottom-1);
-	MoveTo(checkbox.right-1, checkbox.top);
-	LineTo(checkbox.left, checkbox.bottom-1); 
+	MoveTo(checkbox.left+1, checkbox.top+1);
+	LineTo(checkbox.right-2, checkbox.bottom-2);
+	MoveTo(checkbox.right-2, checkbox.top+1);
+	LineTo(checkbox.left+1, checkbox.bottom-2); 
 
 }

xpinstall/wizard/mac/src/ComponentsWin.c

@@ -234,6 +234,7 @@ InComponentsContent(EventRecord* evt, WindowPtr wCurrPtr)
 	int				i;
 	Cell			currCell;
 	UInt8			hiliteVal;
+	PixPatHandle	ppH;
 	GrafPtr			oldPort;
 	GetPort(&oldPort);
 	
@@ -241,6 +242,7 @@ InComponentsContent(EventRecord* evt, WindowPtr wCurrPtr)
 	localPt = evt->where;
 	GlobalToLocal( &localPt);
 	
+	/* Mouse Up */
 	if ((evt->what == mouseUp) && (PtInRect( localPt, &gControls->cw->compListBox)))
 	{
 		LClick(localPt, evt->modifiers, gControls->cw->compList);
@@ -261,6 +263,52 @@ InComponentsContent(EventRecord* evt, WindowPtr wCurrPtr)
 		
 		SetOptInfo(evt);
 	}
+	
+	/* Mouse Down */
+	if ((evt->what == mouseDown) && (PtInRect( localPt, &gControls->cw->compListBox)))
+	{
+		/* show depressed button state */
+	    for (i=0; i<numRows; i++)
+		{
+			SetPt(&currCell, 0, i);
+			LRect(&currCellRect, currCell, gControls->cw->compList);
+			if (PtInRect(localPt, &currCellRect))
+			{
+				SetRect(&checkbox, currCellRect.left+4, currCellRect.top+2, 
+							currCellRect.left+16, currCellRect.top+14);	
+				ppH = GetPixPat(rGrayPixPattern);
+				FillCRect(&checkbox, ppH);	
+				FrameRect(&checkbox);	
+				if (gControls->cfg->comp[rowToComp[i]].selected)
+				{
+					/* draw check mark */
+					MoveTo(checkbox.left+1, checkbox.top+1);
+					LineTo(checkbox.right-2, checkbox.bottom-2);
+					MoveTo(checkbox.right-2, checkbox.top+1);
+					LineTo(checkbox.left+1, checkbox.bottom-2); 
+				}
+				/* create 3D depression */
+				
+				MoveTo(checkbox.left+1, checkbox.top+1);
+				LineTo(checkbox.left+1, checkbox.bottom-1);
+				MoveTo(checkbox.left+1, checkbox.top+1);
+				LineTo(checkbox.right-1, checkbox.top+1);
+				
+				ForeColor(whiteColor);
+				
+				MoveTo(checkbox.right-1, checkbox.top+1);
+				LineTo(checkbox.right-1, checkbox.bottom-1);
+				MoveTo(checkbox.left+1, checkbox.bottom-1);
+				LineTo(checkbox.right-1, checkbox.bottom-1);
+				
+				ForeColor(blackColor);
+			
+				if (ppH)
+					DisposePixPat(ppH);
+				break;
+			}
+		}
+	}
 			
 	HLock((Handle)gControls->backB);
 	r = (**(gControls->backB)).contrlRect;

xpinstall/wizard/mac/src/Deflation.c

@@ -158,7 +158,10 @@ InflateFiles(void *hZip, void *hFind, short tgtVRefNum, long tgtDirID)
 			continue;
 			
 		/* grab leaf filename only */
-		leaf = lastslash + 1;
+		if (lastslash == 0)
+			leaf = filename;
+		else
+			leaf = lastslash + 1;
 		
 		/* obtain and NULL terminate the full path string */
 		err = GetFullPath(tgtVRefNum, tgtDirID, "\p", &fullPathLen, &fullPathH); /* get dirpath */

xpinstall/wizard/mac/src/EvtHandlers.c

@@ -125,16 +125,13 @@ void HandleKeyDown(EventRecord* evt)
 					ShowSetupTypeWin();
 					return;
 				case kSetupTypeID:
-					KillControls(gWPtr);
-					
+					ClearDiskSpaceMsgs();
+					KillControls(gWPtr);			
 					/* treat last setup type selection as custom */
 					if (gControls->opt->instChoice == gControls->cfg->numSetupTypes)
 						ShowComponentsWin();
 					else
-					{
-						ClearDiskSpaceMsgs();
 						ShowTerminalWin();
-					}
 					return;				
 				case kComponentsID:
 					KillControls(gWPtr);

xpinstall/wizard/mac/src/MacInstallWizard.h

@@ -155,6 +155,8 @@ if (err) 								\
 #define rAllProgBar		161
 #define rPerXPIProgBar	162
 
+#define rGrayPixPattern 128
+
 	
 #define rMBar			128		/* menu rsrc ids */	
 #define mApple			150

xpinstall/wizard/mac/src/SetupTypeWin.c

@@ -327,14 +327,14 @@ DrawDiskNFolder(short vRefNum, unsigned char *folder)
 	char			*cstr;
 	Rect			viewRect, dlb, iconRect;
 	TEHandle		pathInfo;
-	short			bCmp;
+	short			bCmp, outVRefNum;
 	OSErr			err = noErr;
 	FSSpec			fsTarget;
 	IconRef			icon;
 	SInt16			label;
-	
+	unsigned long   free, total;
 	/* get vol and folder name */
-	if ((err = GetVol(volName, &vRefNum)) == noErr)
+	if ((err = HGetVInfo(vRefNum, volName, &outVRefNum, &free, &total)) == noErr)
 	{				
 		dlb = (*gControls->stw->destLocBox)->contrlRect;
 		SetRect(&viewRect, dlb.left+10, dlb.top+15, dlb.left+220, dlb.bottom-5);
@@ -385,7 +385,7 @@ DrawDiskNFolder(short vRefNum, unsigned char *folder)
 	if (err==noErr)
 	{
 #define ICON_DIM 32
-		SetRect(&iconRect, viewRect.left+70, viewRect.top+10, viewRect.left+70+ICON_DIM, viewRect.top+10+ICON_DIM);
+		SetRect(&iconRect, viewRect.left+100, viewRect.top+10, viewRect.left+100+ICON_DIM, viewRect.top+10+ICON_DIM);
 		PlotIconRef(&iconRect, kAlignNone, kTransformNone, kIconServicesNormalUsageFlag, icon);
 	}
 	ReleaseIconRef(icon);

xpinstall/wizard/mac/src/TerminalWin.c

@@ -162,6 +162,7 @@ InTerminalContent(EventRecord* evt, WindowPtr wCurrPtr)
 		part = TrackControl(gControls->nextB, evt->where, NULL);
 		if (part)
 		{
+		    DisableNavButtons();
 			SpawnSDThread(Install, &tid);
 			return;
 		}