Merge branch 'main' into newicons

Projects/Compile.pas

@@ -1744,7 +1744,7 @@ begin
       if PrevFileIndex = -1 then
         AbortCompileFmt('Failed to find index of file (%s)', [AFilename]);
     end;
-    PrevFilename := LineFilename;
+    PrevFilename := AFilename;
     GotPrevFilename := True;
   end;
   Result := PrevFileIndex;

Projects/UninstProgressForm.pas

@@ -112,7 +112,7 @@ begin
 
   PageNameLabel.Font.Style := [fsBold];
   PageNameLabel.Caption := SetupMessages[msgWizardUninstalling];
-  WizardSmallBitmapImage.Bitmap.Canvas.Brush.Color := clWindow;
+  WizardSmallBitmapImage.Bitmap.Canvas.Brush.Color := MainPanel.Color;
   WizardSmallBitmapImage.Bitmap.Width := Application.Icon.Width;
   WizardSmallBitmapImage.Bitmap.Height := Application.Icon.Height;
   WizardSmallBitmapImage.Bitmap.Canvas.Draw(0, 0, Application.Icon);