Update VirtualTree component code to 5.1.0 (r450)

components/virtualtreeview/Design/VirtualTreesReg.pas

@@ -5,8 +5,6 @@ unit VirtualTreesReg;
 
 interface
 
-{$include Compilers.inc}
-
 // For some things to work we need code, which is classified as being unsafe for .NET.
 {$warn UNSAFE_TYPE off}
 {$warn UNSAFE_CAST off}

components/virtualtreeview/Source/VTAccessibility.pas

@@ -10,18 +10,13 @@ unit VTAccessibility;
 //
 // Written by Marco Zehe. (c) 2007
 
-{$I Compilers.inc}
-
 interface
 
 uses
-  Windows, Classes, ActiveX,
-  {$ifndef COMPILER_10_UP}
-    MSAAIntf, // MSAA support for Delphi up to 2005
-  {$else}
-    Types,
+  Windows, Classes, ActiveX, Types,
+  {$if CompilerVersion >= 18}
     oleacc, // MSAA support in Delphi 2006 or higher
-  {$endif COMPILER_10_UP}
+  {$ifend}
   VirtualTrees, VTAccessibilityFactory, Controls;
 
 type
@@ -112,6 +107,16 @@ implementation
 uses
   SysUtils, Forms, Variants, Math;
 
+{$if CompilerVersion < 18}
+const
+  //MSAA interfaces not included in Delphi 7
+  ROLE_SYSTEM_OUTLINE = $23 ;
+  ROLE_SYSTEM_OUTLINEITEM = $24 ;
+  STATE_SYSTEM_HASPOPUP = $40000000;
+  IID_IAccessible: TGUID = '{618736E0-3C3D-11CF-810C-00AA00389B71}';
+  function AccessibleObjectFromWindow(hwnd: THandle; dwId: DWORD; const riid: TGUID; out ppvObject): HRESULT; stdcall; external 'oleacc.dll' name 'AccessibleObjectFromWindow'; 
+{$ifend}
+
 
 { TVirtualTreeAccessibility }
 //----------------------------------------------------------------------------------------------------------------------

components/virtualtreeview/Source/VTAccessibilityFactory.pas

@@ -16,16 +16,12 @@ unit VTAccessibilityFactory;
 //
 // Written by Marco Zehe. (c) 2007
 
-{$I Compilers.inc}
-
 interface
 
 uses
-  {$ifndef COMPILER_10_UP}
-    MSAAIntf, // MSAA support for Delphi up to 2005
-  {$else}
+  {$if CompilerVersion >= 18}
     oleacc, // MSAA support in Delphi 2006 or higher
-  {$endif COMPILER_10_UP}
+  {$ifend}
   Classes, VirtualTrees;
 
 type
@@ -115,9 +111,6 @@ destructor TVTAccessibilityFactory.Destroy;
 begin
   FAccessibleProviders.Free;
   FAccessibleProviders := nil;
-  {$ifndef COMPILER_10_UP}
-    FreeAccLibrary;
-  {$endif COMPILER_10_UP}
   inherited Destroy;
 end;
 
@@ -145,11 +138,7 @@ function GetAccessibilityFactory: TVTAccessibilityFactory;
 begin
   // first, check if we've loaded the library already
   if not AccessibilityAvailable then
-    {$ifndef COMPILER_10_UP}
-      AccessibilityAvailable := InitAccLibrary;
-    {$else}
-      AccessibilityAvailable := True;
-    {$endif COMPILER_10_UP}
+    AccessibilityAvailable := True;
   if AccessibilityAvailable then
   begin
     // Check to see if the class has already been created.

components/virtualtreeview/Source/VTHeaderPopup.pas

@@ -63,13 +63,6 @@ unit VTHeaderPopup;
 //   - Added the event to filter the items as they are added to the menu.
 //----------------------------------------------------------------------------------------------------------------------
 
-{$I Compilers.inc}
-
-{$ifdef COMPILER_12_UP}
-  {$WARN IMPLICIT_STRING_CAST       OFF}
-  {$WARN IMPLICIT_STRING_CAST_LOSS  OFF}
-{$endif COMPILER_12_UP}
-
 interface
 
 uses

components/virtualtreeview/packages/delphiXE/VirtualTreesD.dpk

@@ -1,5 +1,6 @@
 package VirtualTreesD;
 
+{$R *.res}
 {$R '..\..\Resources\VirtualTreesD.dcr'}
 {$ALIGN 8}
 {$ASSERTIONS ON}

components/virtualtreeview/packages/delphiXE/VirtualTreesR.dpk

@@ -1,5 +1,6 @@
 package VirtualTreesR;
 
+{$R *.res}
 {$ALIGN 8}
 {$ASSERTIONS OFF}
 {$BOOLEVAL OFF}
@@ -34,9 +35,6 @@ contains
   VTHeaderPopup in '..\..\Source\VTHeaderPopup.pas',
   VTAccessibilityFactory in '..\..\Source\VTAccessibilityFactory.pas',
   VTAccessibility in '..\..\Source\VTAccessibility.pas';
-  // @note, Ansgar: MSAAIntf.pas is not included in the distribution,
-  //                but anyway only needed for Delphi up to 2005
-  //, MSAAIntf in '..\..\Source\MSAAIntf.pas';
 
 end.