Fix for bug 118240: Last screen of wizard must be changed for Mac

customization (r=smeredith)
This commit is contained in:
shrutiv%netscape.com 2002-02-04 19:42:37 +00:00
parent dbc9ade56d
commit d2de257ec2

View File

@ -870,6 +870,9 @@ BOOL CWizardMachineApp::GoToNextNode()
tmpParentNode = tempNode->parent;
CString strPlatform = GetGlobal("lPlatform");
CString strPageName;
while (tmpParentNode->localVars->pageName != "Globals")
{
@ -879,6 +882,11 @@ BOOL CWizardMachineApp::GoToNextNode()
{
tmpParentNode->currNodeIndex++;
strPageName = tmpParentNode->subPages->pages.GetAt(tmpParentNode->currNodeIndex);
// skip Mac installer screen
if ((strPlatform != "MacintoshOSX") && (strPageName == "MacInstaller"))
tmpParentNode->currNodeIndex++;
NODE* siblingNode = tmpParentNode->childNodes[tmpParentNode->currNodeIndex];
if (siblingNode)
@ -1234,6 +1242,14 @@ BOOL CWizardMachineApp::IsLastNode(NODE* treeNode)
{
lastNode = FALSE;
}
// Close Wizard after creating customized Mac files
// and do not proceed to the windows installer screen
CString strPlatform = GetGlobal("lPlatform");
if ((strPlatform == "MacintoshOSX") &&
((treeNode->localVars->pageName) == "MacInstaller"))
lastNode = TRUE;
return lastNode;
}