diff --git a/components/virtualtreeview/packages/RAD Studio 10.4+/VirtualTreesD.dproj b/components/virtualtreeview/packages/RAD Studio 10.4+/VirtualTreesD.dproj
index 45b47128..f823ce64 100644
--- a/components/virtualtreeview/packages/RAD Studio 10.4+/VirtualTreesD.dproj
+++ b/components/virtualtreeview/packages/RAD Studio 10.4+/VirtualTreesD.dproj
@@ -1,127 +1,127 @@
-
-
- True
- Package
- Release
- DCC32
- VCL
- VirtualTreesD.dpk
- Win32
- {A34BA07B-19B6-4C21-9DEE-65FCA52D00AB}
- 19.2
- 1
-
-
- true
-
-
- true
- Base
- true
-
-
- true
- Base
- true
-
-
- true
- Base
- true
-
-
- VirtualTreesD
- All
- ..\..\build\$(Platform)
- VirtualTreeView Controls
- ..\..\Source
- 00400000
- System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)
- true
- ..\..\source;.\$(Platform)\$(Config);$(DCC_UnitSearchPath)
- true
- true
- true
- CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=
- 1053
-
-
- Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)
- vcl;VirtualTreesR;$(DCC_UsePackage)
- $(BDS)\BIN\Bds.exe
-
-
- RELEASE;$(DCC_Define)
-
-
- DEBUG;$(DCC_Define)
- true
- false
-
-
-
- MainSource
-
-
-
-
-
-
- Base
-
-
- Cfg_1
- Base
-
-
- Cfg_2
- Base
-
-
-
- Delphi.Personality.12
- Package
-
-
-
- VirtualTreesD.dpk
-
-
-
- True
- False
- 1
- 0
- 0
- 0
- False
- False
- False
- False
- False
- 1053
- 1252
-
-
-
-
- 1.0.0.0
-
-
-
-
-
- 1.0.0.0
-
-
-
-
- True
- False
-
-
- 12
-
-
-
-
+
+
+ True
+ Package
+ Release
+ DCC32
+ VCL
+ VirtualTreesD.dpk
+ Win32
+ {A34BA07B-19B6-4C21-9DEE-65FCA52D00AB}
+ 19.4
+ 1
+
+
+ true
+
+
+ true
+ Base
+ true
+
+
+ true
+ Base
+ true
+
+
+ true
+ Base
+ true
+
+
+ VirtualTreesD
+ All
+ ..\..\build\$(Platform)
+ VirtualTreeView Controls
+ ..\..\Source
+ 00400000
+ System;Xml;Data;Datasnap;Web;Soap;Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;$(DCC_Namespace)
+ true
+ ..\..\source;.\$(Platform)\$(Config);$(DCC_UnitSearchPath)
+ true
+ true
+ true
+ CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=
+ 1053
+
+
+ Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)
+ vcl;VirtualTreesR;$(DCC_UsePackage)
+ $(BDS)\BIN\Bds.exe
+
+
+ RELEASE;$(DCC_Define)
+
+
+ DEBUG;$(DCC_Define)
+ true
+ false
+
+
+
+ MainSource
+
+
+
+
+
+
+ Base
+
+
+ Cfg_1
+ Base
+
+
+ Cfg_2
+ Base
+
+
+
+ Delphi.Personality.12
+ Package
+
+
+
+ VirtualTreesD.dpk
+
+
+
+ True
+ False
+ 1
+ 0
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ 1053
+ 1252
+
+
+
+
+ 1.0.0.0
+
+
+
+
+
+ 1.0.0.0
+
+
+
+
+ True
+ False
+
+
+ 12
+
+
+
+
diff --git a/components/virtualtreeview/packages/RAD Studio 10.4+/VirtualTreesR.dproj b/components/virtualtreeview/packages/RAD Studio 10.4+/VirtualTreesR.dproj
index 72a4c9bf..ff0f94cb 100644
--- a/components/virtualtreeview/packages/RAD Studio 10.4+/VirtualTreesR.dproj
+++ b/components/virtualtreeview/packages/RAD Studio 10.4+/VirtualTreesR.dproj
@@ -8,7 +8,7 @@
VirtualTreesR.dpk
Win32
{B62F3689-96E1-47D5-9FB2-2A2718281FDB}
- 19.2
+ 19.4
3
diff --git a/source/apphelpers.pas b/source/apphelpers.pas
index 428a13c4..381b33d2 100644
--- a/source/apphelpers.pas
+++ b/source/apphelpers.pas
@@ -10,7 +10,7 @@ interface
uses
Classes, SysUtils, Graphics, GraphUtil, ClipBrd, Dialogs, Forms, Controls, ShellApi,
- Windows, ShlObj, ActiveX, VirtualTrees, SynRegExpr, Messages, Math,
+ Windows, ShlObj, ActiveX, VirtualTrees, VirtualTrees.Types, SynRegExpr, Messages, Math,
Registry, DateUtils, Generics.Collections, System.Contnrs, StrUtils, AnsiStrings, TlHelp32, Types,
dbconnection, dbstructures, dbstructures.mysql, SynMemo, Menus, WinInet, gnugettext, Themes,
Character, ImgList, System.UITypes, ActnList, WinSock, IOUtils, StdCtrls, ComCtrls,
diff --git a/source/extra_controls.pas b/source/extra_controls.pas
index 2c6ede79..8619ea8c 100644
--- a/source/extra_controls.pas
+++ b/source/extra_controls.pas
@@ -5,7 +5,7 @@ interface
uses
Classes, SysUtils, Forms, Windows, Messages, System.Types, StdCtrls, Clipbrd,
SizeGrip, apphelpers, Vcl.Graphics, Vcl.Dialogs, gnugettext, Vcl.ImgList, Vcl.ComCtrls,
- ShLwApi, Vcl.ExtCtrls, VirtualTrees, SynRegExpr, Vcl.Controls, Winapi.ShlObj;
+ ShLwApi, Vcl.ExtCtrls, VirtualTrees, VirtualTrees.Types, SynRegExpr, Vcl.Controls, Winapi.ShlObj;
type
// Form with a sizegrip in the lower right corner, without the need for a statusbar
diff --git a/source/grideditlinks.pas b/source/grideditlinks.pas
index 56627067..19fd2b3d 100644
--- a/source/grideditlinks.pas
+++ b/source/grideditlinks.pas
@@ -5,7 +5,7 @@ unit grideditlinks;
interface
uses
- Windows, Forms, Graphics, Messages, VirtualTrees, ComCtrls, SysUtils, Classes,
+ Windows, Forms, Graphics, Messages, VirtualTrees, VirtualTrees.Types, ComCtrls, SysUtils, Classes,
StdCtrls, ExtCtrls, CheckLst, Controls, Types, Dialogs, Menus, Mask, DateUtils, Math,
dbconnection, dbstructures, apphelpers, texteditor, bineditor, gnugettext,
StrUtils, System.UITypes, SynRegExpr, Vcl.Themes, extra_controls;
diff --git a/source/insertfiles.pas b/source/insertfiles.pas
index 330b9b9d..2a8aaa96 100644
--- a/source/insertfiles.pas
+++ b/source/insertfiles.pas
@@ -552,18 +552,20 @@ var
Node: PVirtualNode;
FileInfo: PFileInfo;
CheckState: TCheckState;
+ Tree: TBaseVirtualTree;
begin
// Header column click / check
MainForm.AnyGridHeaderClick(Sender, HitInfo);
CheckState := Sender.Columns[HitInfo.Column].CheckState;
if (HitInfo.Column = ColBinary) and (not (CheckState in [csMixedNormal, csMixedPressed])) then begin
- Node := Sender.Treeview.GetFirst;
+ Tree := TBaseVirtualTree(Sender.Treeview);
+ Node := Tree.GetFirst;
while Assigned(Node) do begin
- FileInfo := Sender.Treeview.GetNodeData(Node);
+ FileInfo := Tree.GetNodeData(Node);
FileInfo.IsBinary := CheckState in CheckedStates;
- Node := Sender.Treeview.GetNextSibling(Node);
+ Node := Tree.GetNextSibling(Node);
end;
- Sender.Treeview.InvalidateChildren(nil, false);
+ Tree.InvalidateChildren(nil, false);
end;
end;
diff --git a/source/main.pas b/source/main.pas
index b23eb9db..22e1e2ec 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -10,13 +10,14 @@ interface
uses
Windows, SysUtils, Classes, Graphics, GraphUtil, Forms, Controls, Menus, StdCtrls, Dialogs, Buttons,
Messages, ExtCtrls, ComCtrls, StdActns, ActnList, ImgList, ToolWin, Clipbrd, SynMemo, StrUtils,
- SynEdit, SynEditTypes, SynEditKeyCmds, VirtualTrees, DateUtils,
+ SynEdit, SynEditTypes, SynEditKeyCmds, DateUtils,
ShlObj, SynEditMiscClasses, SynEditSearch, SynEditRegexSearch, SynCompletionProposal, SynEditHighlighter,
SynHighlighterSQL, Tabs, SynUnicode, SynRegExpr, ExtActns, IOUtils, Types, Themes, ComObj,
CommCtrl, Contnrs, Generics.Collections, Generics.Defaults, SynEditExport, SynExportHTML, SynExportRTF, Math, ExtDlgs, Registry, AppEvnts,
routine_editor, trigger_editor, event_editor, preferences, EditVar, apphelpers, createdatabase, table_editor,
TableTools, View, Usermanager, SelectDBObject, connections, sqlhelp, dbconnection,
- insertfiles, searchreplace, loaddata, copytable, csv_detector, VirtualTrees.HeaderPopup, VirtualTrees.Utils, Cromis.DirectoryWatch, SyncDB, gnugettext,
+ insertfiles, searchreplace, loaddata, copytable, csv_detector, Cromis.DirectoryWatch, SyncDB, gnugettext,
+ VirtualTrees, VirtualTrees.Header, VirtualTrees.HeaderPopup, VirtualTrees.Utils, VirtualTrees.Types,
JumpList, System.Actions, System.UITypes, pngimage,
System.ImageList, Vcl.Styles.UxTheme, Vcl.Styles.Utils.Menus, Vcl.Styles.Utils.Forms,
Vcl.VirtualImageList, Vcl.BaseImageCollection, Vcl.ImageCollection, System.IniFiles, extra_controls,
@@ -6039,7 +6040,7 @@ end;
procedure TMainForm.DataGridColumnResize(Sender: TVTHeader; Column: TColumnIndex);
begin
// Remember current table after last column resizing so we can auto size them as long as this did not happen
- if not (tsUpdating in Sender.Treeview.TreeStates) then
+ if not (tsUpdating in TBaseVirtualTree(Sender.Treeview).TreeStates) then
FDataGridColumnWidthsCustomized := True;
end;
@@ -8450,7 +8451,7 @@ begin
end;
Screen.Cursor := crHourglass;
Sender.SortColumn := HitInfo.Column;
- Sender.Treeview.SortTree( HitInfo.Column, Sender.SortDirection );
+ TBaseVirtualTree(Sender.Treeview).SortTree( HitInfo.Column, Sender.SortDirection );
Screen.Cursor := crDefault;
end;
diff --git a/source/routine_editor.pas b/source/routine_editor.pas
index fd45b4ec..4ccee7dc 100644
--- a/source/routine_editor.pas
+++ b/source/routine_editor.pas
@@ -4,7 +4,7 @@ interface
uses
Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, SynEdit, SynMemo, StdCtrls,
- ComCtrls, ToolWin, VirtualTrees, SynRegExpr, extra_controls,
+ ComCtrls, ToolWin, VirtualTrees, VirtualTrees.EditLink, SynRegExpr, extra_controls,
dbconnection, apphelpers, gnugettext, Vcl.Menus, Vcl.ExtCtrls;
type
diff --git a/source/selectdbobject.pas b/source/selectdbobject.pas
index f16c0e85..c7f81d0d 100644
--- a/source/selectdbobject.pas
+++ b/source/selectdbobject.pas
@@ -3,7 +3,7 @@ unit selectdbobject;
interface
uses
- Windows, Classes, Controls, Forms, StdCtrls, VirtualTrees, Graphics, extra_controls,
+ Windows, Classes, Controls, Forms, StdCtrls, VirtualTrees, VirtualTrees.Types, Graphics, extra_controls,
dbconnection, gnugettext;
type
diff --git a/source/table_editor.pas b/source/table_editor.pas
index 77d714b3..a0b0e3ff 100644
--- a/source/table_editor.pas
+++ b/source/table_editor.pas
@@ -4,7 +4,7 @@ interface
uses
Windows, SysUtils, Classes, Graphics, Controls, Forms, Dialogs, StdCtrls,
- ComCtrls, ToolWin, VirtualTrees, SynRegExpr, ActiveX, ExtCtrls, SynEdit,
+ ComCtrls, ToolWin, VirtualTrees, VirtualTrees.Types, SynRegExpr, ActiveX, ExtCtrls, SynEdit,
SynMemo, Menus, Clipbrd, Math, System.UITypes, System.Generics.Collections,
grideditlinks, dbstructures, dbstructures.mysql, dbconnection, apphelpers, gnugettext, StrUtils, extra_controls;
diff --git a/source/tabletools.pas b/source/tabletools.pas
index addf0ae1..c6f454c7 100644
--- a/source/tabletools.pas
+++ b/source/tabletools.pas
@@ -10,7 +10,7 @@ interface
uses
Windows, SysUtils, Classes, Controls, Forms, StdCtrls, ComCtrls, Buttons, Dialogs, StdActns,
- VirtualTrees, ExtCtrls, Graphics, SynRegExpr, Math, Generics.Collections, extra_controls,
+ VirtualTrees, VirtualTrees.Header, ExtCtrls, Graphics, SynRegExpr, Math, Generics.Collections, extra_controls,
dbconnection, apphelpers, Menus, gnugettext, DateUtils, System.Zip, System.UITypes, StrUtils, Messages,
SynEdit, SynMemo, ClipBrd, generic_types;