Skip to content

Commit 9259526

Browse files
- Made AdvancedDemo compatible with Delphi 2009+
1 parent 84494c6 commit 9259526

23 files changed

+47
-47
lines changed

Demos/Advanced/AlignDemo.dfm

56 Bytes
Binary file not shown.

Demos/Advanced/AlignDemo.pas

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ TAlignForm = class(TForm)
5050
procedure AlignTreeGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex;
5151
var Ghosted: Boolean; var Index: Integer);
5252
procedure AlignTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType;
53-
var CellText: WideString);
53+
var CellText: UnicodeString);
5454
procedure AlignTreePaintText(Sender: TBaseVirtualTree; const Canvas: TCanvas; Node: PVirtualNode; Column: TColumnIndex;
5555
TextType: TVSTTextType);
5656
procedure AlignTreeGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: Integer);
@@ -101,7 +101,7 @@ implementation
101101
TAlignData = record
102102
MainColumnText,
103103
GreekText,
104-
RTLText: WideString;
104+
RTLText: UnicodeString;
105105
ImageIndex: Integer;
106106
end;
107107

@@ -110,9 +110,9 @@ TAlignData = record
110110
// Additionally, some greek text for another column is stored here too just because I like how it looks (the text,
111111
// not the storage ;-)).
112112
var
113-
GreekStrings: array[0..8] of WideString;
114-
ArabicStrings: array[0..3] of WideString;
115-
HebrewStrings: array[0..2] of WideString;
113+
GreekStrings: array[0..8] of UnicodeString;
114+
ArabicStrings: array[0..3] of UnicodeString;
115+
HebrewStrings: array[0..2] of UnicodeString;
116116

117117
//----------------------------------------------------------------------------------------------------------------------
118118

@@ -173,7 +173,7 @@ procedure TAlignForm.AlignTreePaintText(Sender: TBaseVirtualTree; const Canvas:
173173
//----------------------------------------------------------------------------------------------------------------------
174174

175175
procedure TAlignForm.AlignTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex;
176-
TextType: TVSTTextType; var CellText: WideString);
176+
TextType: TVSTTextType; var CellText: UnicodeString);
177177

178178
var
179179
Data: PAlignData;

Demos/Advanced/DrawTreeDemo.dfm

36 Bytes
Binary file not shown.

Demos/Advanced/DrawTreeDemo.pas

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ TDrawTreeForm = class(TForm)
6565
FDriveStrings: string;
6666
function CanDisplay(const Name: String): Boolean;
6767
function GetDriveString(Index: Integer): string;
68-
function ReadAttributes(const Name: WideString): Cardinal;
68+
function ReadAttributes(const Name: UnicodeString): Cardinal;
6969
procedure RescaleImage(Source, Target: TBitmap);
7070
end;
7171

@@ -89,12 +89,12 @@ implementation
8989
PShellObjectData = ^TShellObjectData;
9090
TShellObjectData = record
9191
FullPath,
92-
Display: WideString;
92+
Display: UnicodeString;
9393
Attributes: Cardinal;
9494
OpenIndex,
9595
CloseIndex: Integer; // image indices into the system image list
9696
Image: TBitmap;
97-
Properties: WideString; // some image properties, preformatted
97+
Properties: UnicodeString; // some image properties, preformatted
9898
end;
9999

100100
//----------------- utility functions ----------------------------------------------------------------------------------
@@ -260,7 +260,7 @@ function TDrawTreeForm.GetDriveString(Index: Integer): string;
260260

261261
//----------------------------------------------------------------------------------------------------------------------
262262

263-
function TDrawTreeForm.ReadAttributes(const Name: WideString): Cardinal;
263+
function TDrawTreeForm.ReadAttributes(const Name: UnicodeString): Cardinal;
264264

265265
// Determines the attributes of the given shell object (file, folder).
266266

@@ -422,7 +422,7 @@ procedure TDrawTreeForm.VDT1DrawNode(Sender: TBaseVirtualTree; const PaintInfo:
422422
var
423423
Data: PShellObjectData;
424424
X: Integer;
425-
S: WideString;
425+
S: UnicodeString;
426426
R: TRect;
427427

428428
begin

Demos/Advanced/Editors.pas

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ interface
2929
PPropertyData = ^TPropertyData;
3030
TPropertyData = record
3131
ValueType: TValueType;
32-
Value: WideString; // This value can actually be a date or a number too.
32+
Value: UnicodeString; // This value can actually be a date or a number too.
3333
Changed: Boolean;
3434
end;
3535

@@ -270,7 +270,7 @@ function TPropertyEditLink.EndEdit: Boolean;
270270
var
271271
Data: PPropertyData;
272272
Buffer: array[0..1024] of Char;
273-
S: WideString;
273+
S: UnicodeString;
274274

275275
begin
276276
Result := True;
@@ -433,7 +433,7 @@ function TGridEditLink.EndEdit: Boolean;
433433
var
434434
Data: PGridData;
435435
Buffer: array[0..1024] of Char;
436-
S: WideString;
436+
S: UnicodeString;
437437
I: Integer;
438438

439439
begin
99 Bytes
Binary file not shown.

Demos/Advanced/GeneralAbilitiesDemo.pas

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ TGeneralForm = class(TForm)
5656
procedure VST2InitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode;
5757
var InitialStates: TVirtualNodeInitStates);
5858
procedure VST2InitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal);
59-
procedure VST2NewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; Text: WideString);
59+
procedure VST2NewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; Text: UnicodeString);
6060
procedure VST2GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType;
61-
var CellText: WideString);
61+
var CellText: UnicodeString);
6262
procedure VST2PaintText(Sender: TBaseVirtualTree; const TargetCanvas: TCanvas; Node: PVirtualNode; Column: TColumnIndex;
6363
TextType: TVSTTextType);
6464
procedure VST2GetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: Integer);
@@ -107,7 +107,7 @@ implementation
107107
TNodeData2 = record
108108
Caption,
109109
StaticText,
110-
ForeignText: WideString;
110+
ForeignText: UnicodeString;
111111
ImageIndex,
112112
Level: Integer;
113113
end;
@@ -184,7 +184,7 @@ procedure TGeneralForm.VST2PaintText(Sender: TBaseVirtualTree; const TargetCanva
184184
//----------------------------------------------------------------------------------------------------------------------
185185

186186
procedure TGeneralForm.VST2GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex;
187-
TextType: TVSTTextType; var CellText: WideString);
187+
TextType: TVSTTextType; var CellText: UnicodeString);
188188

189189
// Returns the text as it is stored in the nodes data record.
190190

@@ -327,7 +327,7 @@ procedure TGeneralForm.VST2InitChildren(Sender: TBaseVirtualTree; Node: PVirtual
327327
//----------------------------------------------------------------------------------------------------------------------
328328

329329
procedure TGeneralForm.VST2NewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex;
330-
Text: WideString);
330+
Text: UnicodeString);
331331

332332
// The caption of a node has been changed, keep this in the node record.
333333

@@ -483,7 +483,7 @@ procedure TGeneralForm.SaveButtonClick(Sender: TObject);
483483

484484
var
485485
S: string;
486-
WS: WideString;
486+
WS: UnicodeString;
487487
Data: Pointer;
488488
DataSize: Cardinal;
489489
TargetName: string;

Demos/Advanced/GridDemo.dfm

28 Bytes
Binary file not shown.

Demos/Advanced/GridDemo.pas

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ TGridForm = class(TForm)
2828
procedure VST5FocusChanging(Sender: TBaseVirtualTree; OldNode, NewNode: PVirtualNode; OldColumn,
2929
NewColumn: TColumnIndex; var Allowed: Boolean);
3030
procedure VST5GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType;
31-
var CellText: WideString);
31+
var CellText: UnicodeString);
3232
procedure VST5InitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode;
3333
var InitialStates: TVirtualNodeInitStates);
3434
procedure VST5PaintText(Sender: TBaseVirtualTree; const TargetCanvas: TCanvas; Node: PVirtualNode;
@@ -123,7 +123,7 @@ procedure TGridForm.VST5InitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVi
123123
//----------------------------------------------------------------------------------------------------------------------
124124

125125
procedure TGridForm.VST5GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex;
126-
TextType: TVSTTextType; var CellText: WideString);
126+
TextType: TVSTTextType; var CellText: UnicodeString);
127127

128128
var
129129
Data: PGridData;
116 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)