Add support for not having wizard images. Does not change layout.

Author: martijnlaan

Projects/Src/Compiler.SetupCompiler.pas

@@ -8205,7 +8205,7 @@ procedure TSetupCompiler.Compile;
       WizardImages := CreateWizardImagesFromFiles('WizardImageFile', WizardImageFile);
       if SetupDirectiveLines[ssWizardImageBackColor] = 0 then
         SetupHeader.WizardImageBackColor := clWindow;
-    end else begin
+    end else if SetupDirectiveLines[ssWizardImageFile] = 0 then begin
       WizardImages := CreateWizardImagesFromResources(['WizardImage'], ['150'], IsForcedDark);
       if SetupDirectiveLines[ssWizardImageBackColor] = 0 then begin
         { The following colors were determined by using the ColorBlendRGB function to blend from the
@@ -8218,7 +8218,8 @@ procedure TSetupCompiler.Compile;
         else
           SetupHeader.WizardImageBackColor := IfThen(IsForcedDark, $3f3a2e, $f9f3e8); { Also see below }
       end;
-    end;
+    end else if SetupDirectiveLines[ssWizardImageBackColor] = 0 then
+      SetupHeader.WizardImageBackColor := clNone;
     LineNumber := SetupDirectiveLines[ssWizardSmallImageFile];
     AddStatus(Format(SCompilerStatusReadingFile, ['WizardSmallImageFile']));
     if WizardSmallImageFile <> '' then begin
@@ -8229,11 +8230,13 @@ procedure TSetupCompiler.Compile;
       WizardSmallImages := CreateWizardImagesFromFiles('WizardSmallImage', WizardSmallImageFile);
       if SetupDirectiveLines[ssWizardSmallImageBackColor] = 0 then
         SetupHeader.WizardSmallImageBackColor := clWindow;
-    end else begin
+    end else if SetupDirectiveLines[ssWizardSmallImageFile] = 0 then begin
       WizardSmallImages := CreateWizardImagesFromResources(['WizardSmallImage'], ['250'], IsForcedDark);
       if SetupDirectiveLines[ssWizardSmallImageBackColor] = 0 then
         SetupHeader.WizardSmallImageBackColor := clNone;
-    end;
+    end else if SetupDirectiveLines[ssWizardSmallImageBackColor] = 0 then
+      SetupHeader.WizardSmallImageBackColor := clNone;
+
     LineNumber := 0;
 
     { Read dark dynamic wizard images }
@@ -8244,22 +8247,24 @@ procedure TSetupCompiler.Compile;
         WizardImagesDynamicDark := CreateWizardImagesFromFiles('WizardImageFileDynamicDark', WizardImageFileDynamicDark);
         if SetupDirectiveLines[ssWizardImageBackColorDynamicDark] = 0 then
           SetupHeader.WizardImageBackColorDynamicDark := clWindow;
-      end else begin
+      end else if SetupDirectiveLines[ssWizardImageFileDynamicDark] = 0 then begin
         WizardImagesDynamicDark := CreateWizardImagesFromResources(['WizardImage'], ['150'], True);
         if SetupDirectiveLines[ssWizardImageBackColorDynamicDark] = 0 then
           SetupHeader.WizardImageBackColorDynamicDark := $3f3a2e; { See above }
-      end;
+      end else if SetupDirectiveLines[ssWizardImageBackColorDynamicDark] = 0 then
+        SetupHeader.WizardImageBackColorDynamicDark := clNone;
       LineNumber := SetupDirectiveLines[ssWizardSmallImageFileDynamicDark];
       AddStatus(Format(SCompilerStatusReadingFile, ['WizardSmallImageFileDynamicDark']));
       if WizardSmallImageFileDynamicDark <> '' then begin
         WizardSmallImagesDynamicDark := CreateWizardImagesFromFiles('WizardSmallImageDynamicDark', WizardSmallImageFileDynamicDark);
         if SetupDirectiveLines[ssWizardSmallImageBackColorDynamicDark] = 0 then
           SetupHeader.WizardSmallImageBackColorDynamicDark := clWindow;
-      end else begin
+      end else if SetupDirectiveLines[ssWizardSmallImageFileDynamicDark] = 0 then begin
         WizardSmallImagesDynamicDark := CreateWizardImagesFromResources(['WizardSmallImage'], ['250'], True);
         if SetupDirectiveLines[ssWizardSmallImageBackColorDynamicDark] = 0 then
           SetupHeader.WizardSmallImageBackColorDynamicDark := clNone;
-      end;
+      end else if SetupDirectiveLines[ssWizardSmallImageBackColorDynamicDark] = 0 then
+        SetupHeader.WizardSmallImageBackColorDynamicDark := clNone;
       LineNumber := 0;
     end;