Fix warnings.

Components/NewCheckListBox.pas

@@ -11,13 +11,6 @@ unit NewCheckListBox;
   Item.Objects yourself, use ItemObject instead.
 }
 
-{$IFDEF VER90}
-  {$DEFINE DELPHI2}
-{$ENDIF}
-{$IFDEF VER200}
-  {$DEFINE DELPHI2009}
-{$ENDIF}
-
 interface
 
 uses
@@ -204,8 +197,7 @@ procedure Register;
 implementation
 
 uses
-  TmSchemaISX, PathFunc, {$IFDEF DELPHI2} Ole2 {$ELSE} ActiveX {$ENDIF},
-  BidiUtils{$IFDEF DELPHI2009}, Types{$ENDIF};
+  TmSchemaISX, PathFunc, ActiveX, BidiUtils, Types;
 
 const
   sRadioCantHaveDisabledChildren = 'Radio item cannot have disabled child items';

Components/NewNotebook.pas

@@ -2,19 +2,13 @@ unit NewNotebook;
 
 {
   Inno Setup
-  Copyright (C) 1997-2008 Jordan Russell
+  Copyright (C) 1997-2018 Jordan Russell
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
   TNewNotebook component
-
-  $jrsoftware: issrc/Components/NewNotebook.pas,v 1.4 2008/10/08 23:23:02 jr Exp $
 }
 
-{$IFDEF VER90}
-  {$DEFINE DELPHI2}
-{$ENDIF}
-
 interface
 
 uses
@@ -40,8 +34,7 @@ type
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
     function FindNextPage(CurPage: TNewNotebookPage; GoForward: Boolean): TNewNotebookPage;
-    procedure GetChildren(Proc: TGetChildProc {$IFNDEF DELPHI2} ;
-      Root: TComponent {$ENDIF}); override;
+    procedure GetChildren(Proc: TGetChildProc; Root: TComponent); override;
     property PageCount: Integer read GetPageCount;
     property Pages[Index: Integer]: TNewNotebookPage read GetPage;
   published
@@ -113,6 +106,9 @@ type
 
 implementation
 
+uses
+  Types;
+
 { TNewNotebookPage }
 
 constructor TNewNotebookPage.Create(AOwner: TComponent);

Components/ScintEdit.pas

@@ -2,7 +2,7 @@ unit ScintEdit;
 
 {
   Inno Setup
-  Copyright (C) 1997-2010 Jordan Russell
+  Copyright (C) 1997-2018 Jordan Russell
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
@@ -386,12 +386,7 @@ type
 implementation
 
 uses
-  ShellAPI,
-{$IFDEF UNICODE}
-  RTLConsts;
-{$ELSE}
-  Consts;
-{$ENDIF}
+  ShellAPI, RTLConsts, UITypes;
 
 { TScintEdit }
 

Projects/CompForm.pas

@@ -429,7 +429,7 @@ procedure InitFormFont(Form: TForm);
 implementation
 
 uses
-  ActiveX, Clipbrd, ShellApi, ShlObj, IniFiles, Registry, CommDlg, Consts,
+  ActiveX, Clipbrd, ShellApi, ShlObj, IniFiles, Registry, CommDlg, Consts, Types,
   PathFunc, CmnFunc, CmnFunc2, FileClass, CompMsgs, TmSchemaISX, BrowseFunc,
   HtmlHelpFunc, TaskbarProgressFunc,
   {$IFDEF STATICCOMPILER} Compile, {$ENDIF}

Projects/CompWizard.pas

@@ -2,7 +2,7 @@ unit CompWizard;
 
 {
   Inno Setup
-  Copyright (C) 1997-2015 Jordan Russell
+  Copyright (C) 1997-2018 Jordan Russell
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
@@ -164,7 +164,7 @@ implementation
 {$R *.DFM}
 
 uses
-  SysUtils, ShlObj, {$IFNDEF Delphi3orHigher} Ole2, {$ELSE} ActiveX, {$ENDIF}
+  SysUtils, ShlObj, ActiveX, UITypes,
   PathFunc, CmnFunc, CmnFunc2, VerInfo, BrowseFunc,
   CompMsgs, CompWizardFile, CompForm;
 

Projects/ISPP/IsppIdentMan.pas

@@ -113,7 +113,7 @@ const
 
 implementation
 
-uses Windows, IsppTranslate, CParser, IsppParser, IsppVarUtils, IsppConsts,
+uses Windows, Types, IsppTranslate, CParser, IsppParser, IsppVarUtils, IsppConsts,
   IsppSessions;
 
 const

Projects/Wizard.pas

@@ -2,7 +2,7 @@ unit Wizard;
 
 {
   Inno Setup
-  Copyright (C) 1997-2011 Jordan Russell
+  Copyright (C) 1997-2018 Jordan Russell
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
 
@@ -249,7 +249,7 @@ function ValidateCustomDirEdit(const AEdit: TEdit;
 implementation
 
 uses
-  ShellApi, ShlObj, Msgs, Main, PathFunc, CmnFunc, CmnFunc2,
+  ShellApi, ShlObj, Types, Msgs, Main, PathFunc, CmnFunc, CmnFunc2,
   MD5, InstFunc, SelFolderForm, Extract, Logging, RestartManager;
 
 {$R *.DFM}