Skip to content

Commit 194a43c

Browse files
joachimmarderjoachimmarder
authored
Merge pull request #1339 from chuacw/IncompatibleEventSignatures
Incompatible event signatures
2 parents 65f4d6d + 60b4992 commit 194a43c

15 files changed

+75
-51
lines changed

‎Demos/Advanced/AlignDemo.pas‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@ interface
1515
{$warn UNSAFE_CODE off}
1616

1717
uses
18-
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
19-
StdCtrls, Buttons, VirtualTrees, ComCtrls, ExtCtrls, ImgList, Menus, UITypes, VirtualTrees.Types, System.ImageList;
18+
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Graphics,
19+
Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.Buttons,
20+
VirtualTrees, Vcl.ComCtrls, Vcl.ExtCtrls, Vcl.ImgList, Vcl.Menus, System.UITypes,
21+
VirtualTrees.Types, System.ImageList, VirtualTrees.BaseAncestorVCL,
22+
VirtualTrees.BaseTree, VirtualTrees.AncestorVCL;
2023

2124
type
2225
TAlignForm = class(TForm)

‎Demos/Advanced/DrawTreeDemo.pas‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@
2424
interface
2525

2626
uses
27-
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
28-
VirtualTrees, StdCtrls, {$ifdef GraphicEx} GraphicEx, {$else} JPEG, {$endif}
29-
ImgList, ComCtrls, UITypes, VirtualTrees.DrawTree, System.ImageList, VirtualTrees.Types;
27+
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes,
28+
Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs,
29+
VirtualTrees, Vcl.StdCtrls,
30+
{$ifdef GraphicEx} GraphicEx, {$else} Vcl.Imaging.JPEG, {$endif}
31+
Vcl.ImgList, Vcl.ComCtrls, System.UITypes, VirtualTrees.DrawTree,
32+
System.ImageList, VirtualTrees.Types, VirtualTrees.BaseAncestorVCL,
33+
VirtualTrees.BaseTree, VirtualTrees.AncestorVCL;
3034

3135
type
3236
TDrawTreeForm = class(TForm)
@@ -46,7 +50,7 @@ TDrawTreeForm = class(TForm)
4650
procedure VDT1GetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex;
4751
var Ghosted: Boolean; var Index: TImageIndex);
4852
procedure VDT1GetNodeWidth(Sender: TBaseVirtualTree; Canvas: TCanvas; Node: PVirtualNode; Column: TColumnIndex;
49-
var NodeWidth: Integer);
53+
var NodeWidth: TDimension);
5054
procedure VDT1HeaderClick(Sender: TVTHeader; HitInfo: TVTHeaderHitInfo);
5155
procedure VDT1InitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal);
5256
procedure VDT1InitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode;
@@ -484,7 +488,7 @@ procedure TDrawTreeForm.VDT1DrawNode(Sender: TBaseVirtualTree; const PaintInfo:
484488
//----------------------------------------------------------------------------------------------------------------------
485489

486490
procedure TDrawTreeForm.VDT1GetNodeWidth(Sender: TBaseVirtualTree; Canvas: TCanvas; Node: PVirtualNode; Column: TColumnIndex;
487-
var NodeWidth: Integer);
491+
var NodeWidth: TDimension);
488492

489493
// Since the draw tree does not know what is in a cell, we have to return the width of the content (not the entire
490494
// cell width, this could be determined by the column width).

‎Demos/Advanced/Editors.pas‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
interface
77

88
uses
9-
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
10-
StdCtrls, ExtDlgs, ImgList, Buttons, ExtCtrls, ComCtrls, Mask,
11-
VirtualTrees, VirtualTrees.EditLink, VirtualTrees.Types;
9+
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Graphics,
10+
Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.ExtDlgs, Vcl.ImgList,
11+
Vcl.Buttons, Vcl.ExtCtrls, Vcl.ComCtrls, Vcl.Mask, VirtualTrees,
12+
VirtualTrees.EditLink, VirtualTrees.Types;
1213

1314
type
1415
// Describes the type of value a property tree node stores in its data property.

‎Demos/Advanced/GeneralAbilitiesDemo.pas‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
unit GeneralAbilitiesDemo;
1+
unit GeneralAbilitiesDemo;
22

33
// Virtual Treeview sample form demonstrating following features:
44
// - General use and feel of TVirtualStringTree.
@@ -25,10 +25,12 @@ interface
2525
{$ifend}
2626

2727
uses
28-
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
29-
StdCtrls, Buttons, VirtualTrees, ComCtrls, ExtCtrls, ImgList, Menus,
30-
StdActns, ActnList, VirtualTrees.HeaderPopup, UITypes, System.ImageList, VirtualTrees.BaseTree,
31-
VirtualTrees.Types, VirtualTrees.BaseAncestorVCL, VirtualTrees.AncestorVCL;
28+
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Graphics,
29+
Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, Vcl.Buttons, VirtualTrees,
30+
Vcl.ComCtrls, Vcl.ExtCtrls, Vcl.ImgList, Vcl.Menus, Vcl.StdActns, Vcl.ActnList,
31+
VirtualTrees.HeaderPopup, System.UITypes, System.ImageList,
32+
VirtualTrees.BaseTree, VirtualTrees.Types, VirtualTrees.BaseAncestorVCL,
33+
VirtualTrees.AncestorVCL;
3234

3335
type
3436
TGeneralForm = class(TForm)
@@ -259,7 +261,7 @@ procedure TGeneralForm.VST2InitNode(Sender: TBaseVirtualTree; ParentNode, Node:
259261
4:
260262
begin
261263
ForeignText := WideChar($20AC);
262-
ForeignText := 'nichts ist unmöglich ' + ForeignText;
264+
ForeignText := 'nichts ist unmöglich ' + ForeignText;
263265
end;
264266
5:
265267
begin

‎Demos/Advanced/GridDemo.pas‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
interface
1111

1212
uses
13-
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
14-
StdCtrls, VirtualTrees, ImgList, Menus, System.ImageList, VirtualTrees.BaseTree, VirtualTrees.Types,
13+
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Graphics,
14+
Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, VirtualTrees,
15+
Vcl.ImgList, Vcl.Menus, System.ImageList, VirtualTrees.BaseTree, VirtualTrees.Types,
1516
VirtualTrees.BaseAncestorVCL, VirtualTrees.AncestorVCL;
1617

1718
type
@@ -48,7 +49,7 @@ TGridForm = class(TForm)
4849
procedure AutoSpanCheckBoxClick(Sender: TObject);
4950
procedure DisplayFullNameCheckBoxClick(Sender: TObject);
5051
procedure VST5ColumnHeaderSpanning(Sender: TVTHeader; Column: TColumnIndex;
51-
var Count: Cardinal);
52+
var Count: Integer);
5253
end;
5354

5455
var
@@ -190,7 +191,7 @@ procedure TGridForm.VST5BeforeCellPaint(Sender: TBaseVirtualTree; TargetCanvas:
190191

191192
//----------------------------------------------------------------------------------------------------------------------
192193

193-
procedure TGridForm.VST5ColumnHeaderSpanning(Sender: TVTHeader; Column: TColumnIndex; var Count: Cardinal);
194+
procedure TGridForm.VST5ColumnHeaderSpanning(Sender: TVTHeader; Column: TColumnIndex; var Count: Integer);
194195
begin
195196
case Column of
196197
2:

‎Demos/Advanced/HeaderCustomDrawDemo.pas‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,11 @@
77
interface
88

99
uses
10-
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
11-
Dialogs, ImgList, VirtualTrees, StdCtrls, ExtCtrls, VirtualTrees.BaseTree, System.ImageList,
12-
VirtualTrees.Types, VirtualTrees.BaseAncestorVCL, VirtualTrees.AncestorVCL;
10+
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Variants,
11+
System.Classes, Vcl.Graphics, Vcl.Controls, Vcl.Forms, Vcl.Dialogs,
12+
Vcl.ImgList, VirtualTrees, Vcl.StdCtrls, Vcl.ExtCtrls, VirtualTrees.BaseTree,
13+
System.ImageList, VirtualTrees.Types, VirtualTrees.BaseAncestorVCL,
14+
VirtualTrees.AncestorVCL;
1315

1416
type
1517
THeaderOwnerDrawForm = class(TForm)

‎Demos/Advanced/Main.pas‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ interface
1212
{$warn UNSAFE_CODE off}
1313

1414
uses
15-
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
16-
ComCtrls, ToolWin, Buttons, ExtCtrls, StdCtrls, ImgList, ActnList,
17-
StdActns, VirtualTrees;
15+
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Graphics,
16+
Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.ComCtrls, Vcl.ToolWin, Vcl.Buttons,
17+
Vcl.ExtCtrls, Vcl.StdCtrls, Vcl.ImgList, Vcl.ActnList,
18+
Vcl.StdActns, VirtualTrees;
1819

1920
type
2021
TMainForm = class(TForm)

‎Demos/Advanced/MultilineDemo.pas‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ interface
88

99
uses
1010
Windows, SysUtils, Classes, Forms, Controls, Graphics, VirtualTrees,
11-
ExtCtrls, StdCtrls, ImgList, VirtualTrees.Types;
11+
ExtCtrls, StdCtrls, ImgList, VirtualTrees.Types, VirtualTrees.BaseAncestorVCL,
12+
VirtualTrees.BaseTree, VirtualTrees.AncestorVCL;
1213

1314
type
1415
TNodeForm = class(TForm)
@@ -26,7 +27,7 @@ TNodeForm = class(TForm)
2627
procedure MLTreeEditing(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; var Allowed: Boolean);
2728
procedure MLTreeStateChange(Sender: TBaseVirtualTree; Enter, Leave: TVirtualTreeStates);
2829
procedure MLTreeMeasureItem(Sender: TBaseVirtualTree; TargetCanvas: TCanvas; Node: PVirtualNode;
29-
var NodeHeight: Integer);
30+
var NodeHeight: TDimension);
3031
procedure AutoAdjustCheckBoxClick(Sender: TObject);
3132
end;
3233

@@ -128,8 +129,8 @@ procedure TNodeForm.MLTreeStateChange(Sender: TBaseVirtualTree; Enter, Leave: TV
128129

129130
//----------------------------------------------------------------------------------------------------------------------
130131

131-
procedure TNodeForm.MLTreeMeasureItem(Sender: TBaseVirtualTree; TargetCanvas: TCanvas; Node: PVirtualNode;
132-
var NodeHeight: Integer);
132+
procedure TNodeForm.MLTreeMeasureItem(Sender: TBaseVirtualTree; TargetCanvas:
133+
TCanvas; Node: PVirtualNode; var NodeHeight: TDimension);
133134

134135
begin
135136
if Sender.MultiLine[Node] then

‎Demos/Advanced/PropertiesDemo.pas‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
interface
1010

1111
uses
12-
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
13-
StdCtrls, VirtualTrees, ImgList, ExtCtrls, UITypes, VirtualTrees.BaseTree, System.ImageList,
14-
VirtualTrees.Types;
12+
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Graphics,
13+
Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, VirtualTrees,
14+
Vcl.ImgList, Vcl.ExtCtrls, System.UITypes, VirtualTrees.BaseTree,
15+
System.ImageList, VirtualTrees.Types, VirtualTrees.BaseAncestorVCL,
16+
VirtualTrees.AncestorVCL;
1517

1618
const
1719
// Helper message to decouple node change handling from edit handling.

‎Demos/Advanced/SpeedDemo.pas‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
interface
99

1010
uses
11-
Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
12-
StdCtrls, VirtualTrees, VirtualTrees.Types, ExtDlgs, ComCtrls, jpeg, Menus;
11+
Winapi.Windows, Winapi.Messages, System.SysUtils, System.Classes, Vcl.Graphics,
12+
Vcl.Controls, Vcl.Forms, Vcl.Dialogs, Vcl.StdCtrls, VirtualTrees,
13+
VirtualTrees.Types, Vcl.ExtDlgs, Vcl.ComCtrls, Vcl.Imaging.jpeg, Vcl.Menus,
14+
VirtualTrees.BaseAncestorVCL, VirtualTrees.BaseTree, VirtualTrees.AncestorVCL;
1315

1416
type
1517
TSpeedForm = class(TForm)

0 commit comments

Comments
 (0)