Update VirtualTrees component code to release v7.6.6 from Jan 12 2024

HeidiSQL · Jan 29, 2024 · f3ce46a · f3ce46a
1 parent ad37095
commit f3ce46a
Show file tree

Hide file tree

Showing 47 changed files with 38,135 additions and 34,160 deletions.
diff --git a/components/virtualtreeview/.gitignore b/components/virtualtreeview/.gitignore
@@ -1,54 +1,56 @@
-# Compiled source #
-###################
-*.dcu
-*.obj
-*.exe
-*.bpl
-*.bpi
-*.dcp
-*.rsm
-*.stat
-*.map
-*.d
-*.o
-
-# Generated source #
-###################
-*.hpp
-
-# Backup files    #
-###################
-*.~*
-
-# IDE Files	  #
-###################
-*.dproj.local
-*.groupproj.local
-*.identcache
-*.dsk
-*.tvsconfig
-*.otares
-*.drc
-*.rc
-*.res
-*.local
-
-# Output Folders  #
-###################
-/Win32
-/Win64
-/OSX32
-/__history
-*.bak
-*.Patch
-VirtualTreeView.zip
-*.#00
-*.pch
-*.skincfg
-*.a
-Packages/RAD Studio XE3/VirtualTreesR.lib
-*.lib
-
-# Folder with repro projects #
-##############################
+# Compiled source #
+###################
+*.dcu
+*.obj
+*.exe
+*.bpl
+*.bpi
+*.dcp
+*.rsm
+*.stat
+*.map
+*.d
+*.o
+
+# Generated source #
+###################
+*.hpp
+
+# Backup files    #
+###################
+*.~*
+__recovery
+
+# IDE Files	  #
+###################
+*.dproj.local
+*.groupproj.local
+*.identcache
+*.dsk
+*.tvsconfig
+*.otares
+*.drc
+*.rc
+*.res
+*.local
+*.dsv
+
+# Output Folders  #
+###################
+/Win32
+/Win64
+/OSX32
+/__history
+*.bak
+*.Patch
+VirtualTreeView.zip
+*.#00
+*.pch
+*.skincfg
+*.a
+Packages/RAD Studio XE3/VirtualTreesR.lib
+*.lib
+
+# Folder with repro projects #
+##############################
 /#*
diff --git a/components/virtualtreeview/Design/VirtualTreesReg.pas b/components/virtualtreeview/Design/VirtualTreesReg.pas
@@ -11,8 +11,7 @@ interface
 {$warn UNSAFE_CODE off}
 
 uses
-  Windows, Classes, DesignIntf, DesignEditors, VCLEditors, PropertyCategories,
-  ColnEdit, VirtualTrees, VirtualTrees.HeaderPopup;
+  DesignEditors;
 
 type
   TVirtualTreeEditor = class (TDefaultEditor)
@@ -27,8 +26,12 @@ procedure Register;
 implementation
 
 uses
-  StrEdit, Dialogs, TypInfo, SysUtils, Graphics, CommCtrl, ImgList, Controls,
-  VirtualTrees.ClipBoard, VirtualTrees.Actions;
+  WinApi.Windows, WinApi.CommCtrl,
+  System.TypInfo, System.SysUtils, System.Classes,
+  StrEdit,DesignIntf, VCLEditors, PropertyCategories, ColnEdit,
+  Vcl.Dialogs, Vcl.Graphics, Vcl.ImgList, Vcl.Controls,
+  VirtualTrees.ClipBoard, VirtualTrees.Actions, VirtualTrees, VirtualTrees.DrawTree,
+  VirtualTrees.HeaderPopup, VirtualTrees.BaseTree;
 
 type
   // The usual trick to make a protected property accessible in the ShowCollectionEditor call below.

diff --git a/components/virtualtreeview/MAKEFILE b/components/virtualtreeview/MAKEFILE
@@ -1,21 +1,30 @@
-PROJECT = VirtualTrees
-EMBARCADERO = $(PROGRAMFILES)\Embarcadero\RAD Studio
-STUDIO = $(PROGRAMFILES)\Embarcadero\Studio
-BDSCOMMONDIRMAIN = %PUBLIC%\Documents\Embarcadero\Studio
+# Program files folder
+PROGRAMFILESX64 = $(PROGRAMFILES)
+!IF EXIST("C:\Program Files (x86)")
+PROGRAMFILES = C:\Program Files (x86)
+PROGRAMFILESX64 = C:\Program Files
+!ENDIF
+
 # Default MS Build version
 !IF EXIST("$(PROGRAMFILESX64)\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\msbuild.exe")
 BUILDEXE = "$(PROGRAMFILESX64)\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\msbuild.exe"
+!ELSE IF EXIST("$(PROGRAMFILESX64)\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\msbuild.exe")
+BUILDEXE = "$(PROGRAMFILESX64)\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\msbuild.exe"
+!ELSE IF EXIST("$(PROGRAMFILESX64)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe")
+BUILDEXE = "$(PROGRAMFILESX64)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe"
+!ELSE IF EXIST("$(PROGRAMFILESX64)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\msbuild.exe")
+BUILDEXE = "$(PROGRAMFILESX64)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\msbuild.exe"
+!ELSE IF EXIST("$(PROGRAMFILESX64)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe")
+BUILDEXE = "$(PROGRAMFILESX64)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe"
 !ELSE 
-!IF EXIST("$(PROGRAMFILES)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe")
-BUILDEXE = "$(PROGRAMFILES)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe"
-!ELSE
-!IF EXIST("$(PROGRAMFILES)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\msbuild.exe")
-BUILDEXE = "$(PROGRAMFILES)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\msbuild.exe"
-!ELSE
-BUILDEXE = "$(PROGRAMFILES)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe"
-!ENDIF
-!ENDIF
+BUILDEXE = "msbuild.exe"
 !ENDIF
+
+PROJECT = VirtualTrees
+EMBARCADERO = $(PROGRAMFILES)\Embarcadero\RAD Studio
+STUDIO = $(PROGRAMFILES)\Embarcadero\Studio
+BDSCOMMONDIRMAIN = %PUBLIC%\Documents\Embarcadero\Studio
+
 BUILD = $(BUILDEXE) /t:Rebuild
 
 clean:  
@@ -24,6 +33,13 @@ clean:
 	DEL /S /Q .\*.DCU
 #TODO: Add demos and package folders
 
+12.0: Source\*.pas "Packages\RAD Studio 10.4+\$(PROJECT)R.dpk" "Packages\RAD Studio 10.4+\$(PROJECT)R.dproj" "Packages\RAD Studio 10.4+\$(PROJECT)D.dpk" "Packages\RAD Studio 10.4+\$(PROJECT)D.dproj"
+	SET BDS=$(STUDIO)\23.0
+	$(BUILD) "Packages\RAD Studio 10.4+\$(PROJECT)R.dproj"
+	$(BUILD) "Packages\RAD Studio 10.4+\$(PROJECT)D.dproj"
+	$(BUILD) /property:Platform=Win64 "Packages\RAD Studio 10.4+\$(PROJECT)R.dproj"
+	$(MAKE) _samples
+
 # build all packages for Delphi 10.4.   Note: The variable $@ is expanded to the build target name
 10.1 10.2 10.3 10.4+: Source\*.pas "Packages\RAD Studio $@\$(PROJECT)R.dpk" "Packages\RAD Studio $@\$(PROJECT)R.dproj" "Packages\RAD Studio $@\$(PROJECT)D.dpk" "Packages\RAD Studio $@\$(PROJECT)D.dproj"
 	SET BDS=$(STUDIO)\21.0
@@ -46,7 +62,7 @@ clean:
 
 _samples: "Demos\Advanced\Advanced.exe" "Demos\Minimal\Minimal.exe" "Demos\Objects\Objects.exe" "Demos\OLE\OLE.exe"
 
-_continuousbuilds: clean 10.4+
+_continuousbuilds: clean 12.0
 
 _release:
 #This small batch file is intended to create a source code release file of the VirtualTreeView as ZIP archive
@@ -56,4 +72,4 @@ _release:
 	ECHO Source code zip archive "VirtualTreeView.zip" created. 
 	ECHO !!! Please add version number to ZIP file name!!!
 	ECHO !!! Please create release at: https://github.com/Virtual-TreeView/Virtual-TreeView/releases
-	ECHO !!! Let JAM web-team upload the file to our server at https://www.jam-software.com/virtual-treeview
+	ECHO !!! Let JAM web-team upload the file to our server at https://www.jam-software.com/virtual-treeview
diff --git a/components/virtualtreeview/README.md b/components/virtualtreeview/README.md
@@ -5,7 +5,9 @@ Virtual Treeview is a Delphi treeview control built from ground up. Many years o
 I don't use C++ Builder and my experience with it is very limited. This makes it difficult to take care about bugs that are reported in C++ Builder and to maintain the C++ Builder packages. I would be great if someone would volunteer to do this.
 
 ### Downloads
-**V7.6.x** official release for **RAD Studio XE3 to 10.4.2 Rio**: [JAM Software](https://www.jam-software.com/virtual-treeview/VirtualTreeView.zip) 
+**V7.6.x** official release for **Delphi XE3 to 11.3** and C++ Buildler 10.1 to 11.3: [JAM Software](https://www.jam-software.com/virtual-treeview/VirtualTreeView.zip) ([Changes](https://github.com/JAM-Software/Virtual-TreeView/releases/latest))
+
+In the master branch we develop **V8** that includes some **[breaking changes](https://github.com/JAM-Software/Virtual-TreeView/wiki/Breaking-Changes-in-upcoming-V8)**.
 
 An experimental **FireMonkey** port can be found here: [livius2/Virtual-TreeView](https://github.com/livius2/Virtual-TreeView)
 
@@ -15,7 +17,7 @@ For a **Delphi XE2** compatible fork see: [Fr0sT-Brutal/VirtualTreeView_mod/tree
 
 For a **Delphi XE** compatible fork see: [sglienke/Virtual-TreeView](https://github.com/sglienke/Virtual-TreeView)
 
-**V5.5.3** for **Delphi 7 to XE2**: [Download](http://www.jam-software.com/virtual-treeview/VirtualTreeViewV5.5.3.zip)
+**V5.5.3** for **Delphi 7 to XE2**: [Download](https://downloads.jam-software.de/virtual-treeview/VirtualTreeViewV5.5.3.zip)
 
 **V6 latest stable version** tested on Windows XP/2003 support: [GitHub](https://github.com/Virtual-TreeView/Virtual-TreeView/archive/V6_stable.zip)
 

diff --git a/components/virtualtreeview/Source/VirtualTrees.Accessibility.pas b/components/virtualtreeview/Source/VirtualTrees.Accessibility.pas
@@ -8,8 +8,10 @@
 interface
 
 uses
-  Winapi.Windows, System.Classes, Winapi.ActiveX, System.Types, Winapi.oleacc,
-  VirtualTrees, VirtualTrees.AccessibilityFactory, Vcl.Controls;
+  Winapi.Windows, Winapi.ActiveX, Winapi.oleacc,
+  System.Classes, System.Types,
+  Vcl.Controls,
+  VirtualTrees, VirtualTrees.AccessibilityFactory, VirtualTrees.BaseTree;
 
 type
   TVirtualTreeAccessibility = class(TInterfacedObject, IDispatch, IAccessible)
@@ -99,7 +101,9 @@   TVTMultiColumnAccessibleItemProvider = class(TInterfacedObject, IVTAccessibleP
 implementation
 
 uses
-  System.SysUtils, Vcl.Forms, System.Variants, System.Math;
+  System.SysUtils, System.Variants, System.Math,
+  Vcl.Forms,
+  VirtualTrees.Types;
 
 type
 
@@ -792,6 +796,3 @@ initialization
   TVirtualTreeAccessibility.RegisterDefaultAccessibleProviders();
 
 end.
-
-
-