Skip to content

Commit bddf170

Browse files
author
Joachim Marder
committed
2 parents 94f7896 + f2e46af commit bddf170

31 files changed

+323
-2312
lines changed

‎Demos/Advanced/Advanced.dproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@
155155
<DCCReference Include="States.pas">
156156
<Form>StateForm</Form>
157157
</DCCReference>
158-
<DCCReference Include="..\..\Source\VirtualTrees.PanningWindow.pas"/>
159158
<BuildConfiguration Include="Base">
160159
<Key>Base</Key>
161160
</BuildConfiguration>

‎Demos/Advanced/GeneralAbilitiesDemo.pas‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ interface
2828
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
2929
StdCtrls, Buttons, VirtualTrees, ComCtrls, ExtCtrls, ImgList, Menus,
3030
StdActns, ActnList, VirtualTrees.HeaderPopup, UITypes, System.ImageList, VirtualTrees.BaseTree,
31-
VirtualTrees.Types;
31+
VirtualTrees.Types, VirtualTrees.BaseAncestorVCL, VirtualTrees.AncestorVCL;
3232

3333
type
3434
TGeneralForm = class(TForm)
@@ -368,15 +368,11 @@ procedure TGeneralForm.VST2GetPopupMenu(Sender: TBaseVirtualTree; Node: PVirtual
368368
const P: TPoint; var AskParent: Boolean; var PopupMenu: TPopupMenu);
369369

370370
begin
371-
case Column of
372-
0:
373-
PopupMenu := PopupMenu1
374-
else
375-
PopupMenu := nil;
376-
end;
371+
if Column <= 0 then
372+
PopupMenu := PopupMenu1;
377373
end;
378374

379-
//----------------------------------------------------------------------------------------------------------------------
375+
//----------------------------------------------------------------------------------------------------------------------;
380376

381377
procedure TGeneralForm.VST2KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
382378

‎Demos/Advanced/VisibilityDemo.pas‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ interface
1111

1212
uses
1313
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
14-
StdCtrls, VirtualTrees, ComCtrls, ExtCtrls, ImgList, VirtualTrees.Types;
14+
StdCtrls, VirtualTrees, ComCtrls, ExtCtrls, ImgList, VirtualTrees.Types,
15+
VirtualTrees.BaseAncestorVCL, VirtualTrees.BaseTree, VirtualTrees.AncestorVCL;
1516

1617
type
1718
TVisibilityForm = class(TForm)
@@ -33,9 +34,9 @@ TVisibilityForm = class(TForm)
3334
procedure RadioGroup1Click(Sender: TObject);
3435
procedure VST2GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType;
3536
var CellText: string);
36-
procedure VST3Scroll(Sender: TBaseVirtualTree; DeltaX, DeltaY: Integer);
37+
procedure VST3Scroll(Sender: TBaseVirtualTree; DeltaX, DeltaY: TDimension);
3738
procedure VST2InitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal);
38-
procedure VST2Scroll(Sender: TBaseVirtualTree; DeltaX, DeltaY: Integer);
39+
procedure VST2Scroll(Sender: TBaseVirtualTree; DeltaX, DeltaY: TDimension);
3940
procedure VSTCollapsedExpanded(Sender: TBaseVirtualTree; Node: PVirtualNode);
4041
procedure VST2Change(Sender: TBaseVirtualTree; Node: PVirtualNode);
4142
procedure Splitter2CanResize(Sender: TObject; var NewSize: Integer;
@@ -184,7 +185,7 @@ procedure TVisibilityForm.VST2GetText(Sender: TBaseVirtualTree; Node: PVirtualNo
184185

185186
//----------------------------------------------------------------------------------------------------------------------
186187

187-
procedure TVisibilityForm.VST3Scroll(Sender: TBaseVirtualTree; DeltaX, DeltaY: Integer);
188+
procedure TVisibilityForm.VST3Scroll(Sender: TBaseVirtualTree; DeltaX, DeltaY: TDimension);
188189

189190
// Synchronizes scroll offsets of VST2 and VST3.
190191

@@ -204,7 +205,7 @@ procedure TVisibilityForm.VST3Scroll(Sender: TBaseVirtualTree; DeltaX, DeltaY: I
204205

205206
//----------------------------------------------------------------------------------------------------------------------
206207

207-
procedure TVisibilityForm.VST2Scroll(Sender: TBaseVirtualTree; DeltaX, DeltaY: Integer);
208+
procedure TVisibilityForm.VST2Scroll(Sender: TBaseVirtualTree; DeltaX, DeltaY: TDimension);
208209

209210
// Synchronizes scroll offsets of VST2 and VST3.
210211

‎Demos/Interfaces/charityevents.dpr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
program charityevents;
1+
program charityevents;
22

33
uses
44
Vcl.Forms,
@@ -15,4 +15,4 @@ begin
1515
Application.CreateForm(TFormModelView, FormModelView);
1616
Application.Run;
1717

18-
end.
18+
end.

‎Demos/Objects/MVCDemo.dproj‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<MainSource>MVCDemo.dpr</MainSource>
55
<Base>True</Base>
66
<Config Condition="'$(Config)'==''">Debug</Config>
7-
<TargetedPlatforms>1</TargetedPlatforms>
7+
<TargetedPlatforms>3</TargetedPlatforms>
88
<AppType>Application</AppType>
99
<FrameworkType>VCL</FrameworkType>
1010
<ProjectVersion>20.2</ProjectVersion>
@@ -40,6 +40,12 @@
4040
<Cfg_2>true</Cfg_2>
4141
<Base>true</Base>
4242
</PropertyGroup>
43+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
44+
<Cfg_2_Win64>true</Cfg_2_Win64>
45+
<CfgParent>Cfg_2</CfgParent>
46+
<Cfg_2>true</Cfg_2>
47+
<Base>true</Base>
48+
</PropertyGroup>
4349
<PropertyGroup Condition="'$(Base)'!=''">
4450
<DCC_SymbolReferenceInfo>1</DCC_SymbolReferenceInfo>
4551
<DCC_F>false</DCC_F>
@@ -83,6 +89,12 @@
8389
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
8490
<BT_BuildType>Debug</BT_BuildType>
8591
</PropertyGroup>
92+
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
93+
<BT_BuildType>Debug</BT_BuildType>
94+
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
95+
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
96+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
97+
</PropertyGroup>
8698
<ItemGroup>
8799
<DelphiCompile Include="$(MainSource)">
88100
<MainSource>MainSource</MainSource>
@@ -138,10 +150,14 @@
138150
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
139151
<VersionInfoKeys Name="Comments"/>
140152
</VersionInfoKeys>
153+
<Excluded_Packages>
154+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
155+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
156+
</Excluded_Packages>
141157
</Delphi.Personality>
142158
<Platforms>
143159
<Platform value="Win32">True</Platform>
144-
<Platform value="Win64">False</Platform>
160+
<Platform value="Win64">True</Platform>
145161
</Platforms>
146162
</BorlandProject>
147163
<ProjectFileVersion>12</ProjectFileVersion>

‎INSTALL.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Extract the entire(!) ZIP file and follow the instructions below.
66
Delphi / RAD Studio 10.4 and higher Installation
77
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
88
1. Open the project group "Packages\RAD Studio 10.4+\VirtualTreeView.groupproj"
9-
2. Right click on root elelment "VirtualTreeView" and click "Build All"
9+
2. Right click on root element "VirtualTreeView" and click "Build All"
1010
3. Right click on "VirtualTreesD*.bpl" and click "Install"
1111
4. Go to "Tools > Options > Language > Delphi Options > Library
1212
5. Choose platform "Win32", click on "Library Path > [...]"
@@ -30,7 +30,7 @@ Delphi / RAD Studio 10.3
3030
2. Right click on "VirtualTreesD270.bpl" and click "Install"
3131
3. Go to "Tools > Options > Language > Delphi Options > Library > Library Path > [...]"
3232
Browse to the "Source" folder of VirtualTreeView, press "OK", "Add", "OK"
33-
Do this for both Win32 and Win64 platform, which you can choose in the dropdown box.
33+
Do this for both Win32 and Win64 platforms, which you can choose in the dropdown box.
3434
4. C++ Builder users only:
3535
In the Options dialog go to "Environment Options > C++ Options > Paths and Directories"
3636
a) Click "Library Path > [...]"
@@ -46,7 +46,7 @@ Delphi / RAD Studio 10.0 - 10.2 Installation
4646
2. Right click on "VirtualTreesD*.bpl" and click "Install"
4747
3. Go to "Tools > Options > Environment Options > Delphi Options > Library > Library Path > [...]"
4848
Browse to the "Source" folder of VirtualTreeView, press "OK", "Add", "OK"
49-
Do this for both Win32 and Win64 platform, which you can choose in the dropdown box.
49+
Do this for both Win32 and Win64 platforms, which you can choose in the dropdown box.
5050
4. C++ Builder users only:
5151
In the Options dialog go to "Environment Options > C++ Options > Paths and Directories"
5252
a) Click "Library Path > [...]"

‎Packages/CBuilder XE7/VirtualTreeView.groupproj‎ renamed to ‎Packages/CBuilder 12/VirtualTrees.groupproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<ProjectGuid>{90943296-FDFA-4C80-A99D-237F570C4F54}</ProjectGuid>
3+
<ProjectGuid>{BF155D09-6AED-4790-9020-744D12876B35}</ProjectGuid>
44
</PropertyGroup>
55
<ItemGroup>
66
<Projects Include="VirtualTreesCR.cbproj">

0 commit comments

Comments
 (0)