Added checkboxes and extended drag multiselection to components win. Also, various minor bug fixes.

xpinstall/wizard/mac/src/ComponentsWin.c

@@ -78,7 +78,8 @@ ShowComponentsWin(void)
 	SetRect(&dataBounds, 0, 0, 1, gControls->cfg->numComps);
 	SetPt( &cSize, 0, 0);
 	gControls->cw->compList = LNew((const Rect*)&gControls->cw->compListBox, (const Rect*)&dataBounds,
-									cSize, 0, gWPtr, true, false, false, true);
+									cSize, rCheckboxLDEF, gWPtr, true, false, false, true);
+	(*gControls->cw->compList)->selFlags = 68; /* NOTE: 64 (aka lExtendDrag) + 4 (aka lUseSense) = 68 */
 	
 	// populate controls
 	bCellSelected = PopulateCompInfo();

xpinstall/wizard/mac/src/EvtHandlers.c

@@ -122,10 +122,16 @@ void HandleKeyDown(EventRecord* evt)
 				if (gControls->opt->instChoice == gControls->cfg->numSetupTypes)
 					ShowComponentsWin();
 				else
+				{
+					ClearDiskSpaceMsgs();
 					ShowTerminalWin();
+				}
 				return;				
 			case kComponentsID:
 				KillControls(gWPtr);
+				gControls->cw->compListBox.top = 0;
+				EraseRect(&gControls->cw->compListBox);
+				ClearDiskSpaceMsgs();
 				ShowTerminalWin();
 				return;
 			case kTerminalID:

xpinstall/wizard/mac/src/MacInstallWizard.h

@@ -150,6 +150,8 @@ if (err) 								\
 #define rCompListBox	150		/* note: overriden use for list and rect */
 #define rCompDescBox	151
 
+#define rCheckboxLDEF	128
+
 #define rStartMsgBox	160
 #define rInstProgBar	161
 

xpinstall/wizard/mac/src/SetupTypeWin.c

@@ -412,7 +412,7 @@ DrawDiskSpaceMsgs(short vRefNum)
 	HLock(instDescRectH);
 	instDescBox = (Rect) **((Rect**)instDescRectH);
 	SetRect( &viewRect, instDescBox.left, instDescBox.bottom + 2, 
-						instDescBox.right, instDescBox.bottom + 12 );
+						instDescBox.right, instDescBox.bottom + 14 );
 	HUnlock(instDescRectH);	
 	DetachResource(instDescRectH);
 	DisposeHandle(instDescRectH); 
@@ -463,7 +463,7 @@ DrawDiskSpaceMsgs(short vRefNum)
 		DisposePtr((Ptr)ckb);
 	
 	SetRect( &viewRect, instDescBox.right - 150, instDescBox.bottom + 2,
-						instDescBox.right, instDescBox.bottom + 12 );
+						instDescBox.right, instDescBox.bottom + 14 );
 	dsNeededH = NULL;
 	dsNeededH = TENew( &viewRect, &viewRect );
 	if (!dsNeededH)
@@ -558,7 +558,7 @@ ClearDiskSpaceMsgs(void)
 	HLock(instDescRectH);
 	instDescBox = (Rect) **((Rect**)instDescRectH);
 	SetRect( &viewRect, instDescBox.left, instDescBox.bottom + 2, 
-						instDescBox.right, instDescBox.bottom + 12 );
+						instDescBox.right, instDescBox.bottom + 14 );
 	HUnlock(instDescRectH);	
 	DetachResource(instDescRectH);
 	DisposeHandle(instDescRectH);