From 116eda1d962cc7a5de85cb75ba9eae51a0a640f1 Mon Sep 17 00:00:00 2001
From: Mark van Renswoude <mark@x2software.net>
Date: Fri, 6 Dec 2013 13:09:39 +0000
Subject: [PATCH] Fixed Delphi 2007 and earlier compatibiilty

---
 Packages/D2007/X2Utils.dpk   |  3 ++-
 Packages/D2007/X2Utils.dproj | 17 +++++------------
 X2UtDelphiCompatibility.pas  |  2 +-
 X2UtNamedFormat.pas          |  4 +++-
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/Packages/D2007/X2Utils.dpk b/Packages/D2007/X2Utils.dpk
index 065a37c..a568773 100644
--- a/Packages/D2007/X2Utils.dpk
+++ b/Packages/D2007/X2Utils.dpk
@@ -57,6 +57,7 @@ contains
   X2UtPersistXML in '..\..\X2UtPersistXML.pas',
   X2UtPersistXMLBinding in '..\..\X2UtPersistXMLBinding.pas',
   XMLDataBindingUtils in '..\..\XMLDataBinding\XMLDataBindingUtils.pas',
-  X2UtCursors in '..\..\X2UtCursors.pas';
+  X2UtCursors in '..\..\X2UtCursors.pas',
+  X2UtDelphiCompatibility in '..\..\X2UtDelphiCompatibility.pas';
 
 end.
diff --git a/Packages/D2007/X2Utils.dproj b/Packages/D2007/X2Utils.dproj
index 43835ff..8242121 100644
--- a/Packages/D2007/X2Utils.dproj
+++ b/Packages/D2007/X2Utils.dproj
@@ -6,7 +6,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>..\..\..\Bpl\D2006\X2Utils2007.bpl</DCC_DependencyCheckOutputName>
+    <DCC_DependencyCheckOutputName>%DELPHIBIN%\X2Utils2007.bpl</DCC_DependencyCheckOutputName>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Version>7.0</Version>
@@ -32,14 +32,6 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">X2Utils</Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">True</Package_Options><Package_Options Name="LibSuffix">2007</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1043</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">X2Utils.dpk</Source></Source><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
     </Excluded_Packages></Delphi.Personality></BorlandProject></BorlandProject>
@@ -49,9 +41,13 @@
     <DelphiCompile Include="X2Utils.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\..\..\..\rtl.dcp" />
+    <DCCReference Include="..\..\..\..\vcl.dcp" />
+    <DCCReference Include="..\..\..\..\xmlrtl.dcp" />
     <DCCReference Include="..\..\X2UtApp.pas" />
     <DCCReference Include="..\..\X2UtBits.pas" />
     <DCCReference Include="..\..\X2UtCursors.pas" />
+    <DCCReference Include="..\..\X2UtDelphiCompatibility.pas" />
     <DCCReference Include="..\..\X2UtElevation.pas" />
     <DCCReference Include="..\..\X2UtGraphics.pas" />
     <DCCReference Include="..\..\X2UtHandCursor.pas" />
@@ -74,8 +70,5 @@
     <DCCReference Include="..\..\X2UtStrings.pas" />
     <DCCReference Include="..\..\X2UtTempFile.pas" />
     <DCCReference Include="..\..\XMLDataBinding\XMLDataBindingUtils.pas" />
-    <DCCReference Include="C:\Users\PsychoMark\AppData\Roaming\Microsoft\Internet Explorer\Quick Launch\Development\rtl.dcp" />
-    <DCCReference Include="C:\Users\PsychoMark\AppData\Roaming\Microsoft\Internet Explorer\Quick Launch\Development\vcl.dcp" />
-    <DCCReference Include="C:\Users\PsychoMark\AppData\Roaming\Microsoft\Internet Explorer\Quick Launch\Development\xmlrtl.dcp" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/X2UtDelphiCompatibility.pas b/X2UtDelphiCompatibility.pas
index 402c23f..f01040e 100644
--- a/X2UtDelphiCompatibility.pas
+++ b/X2UtDelphiCompatibility.pas
@@ -13,7 +13,7 @@ implementation
 {$IF CompilerVersion < 20}
 uses
   Windows;
-{$ENDIF}
+{$IFEND}
 
 
 function CharInSet(C: Char; const CharSet: TSysCharSet): Boolean;
diff --git a/X2UtNamedFormat.pas b/X2UtNamedFormat.pas
index a04d12e..b71a3e0 100644
--- a/X2UtNamedFormat.pas
+++ b/X2UtNamedFormat.pas
@@ -44,7 +44,9 @@ type
 
 implementation
 uses
-  Windows;
+  Windows,
+
+  X2UtDelphiCompatibility;
 
 
 {$I X2UtCompilerVersion.inc}