From cfd18f9fb20a63ecda6d19431a7c78200cfecc85 Mon Sep 17 00:00:00 2001 From: blikblum Date: Thu, 31 Dec 2009 14:06:29 +0000 Subject: [PATCH] * Replace UTF8String by String in all demos git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1107 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- .../trunk/demos/advanced/AlignDemo.pas | 12 ++++++------ .../trunk/demos/advanced/DrawTreeDemo.pas | 10 +++++----- .../trunk/demos/advanced/Editors.pas | 4 ++-- .../demos/advanced/GeneralAbilitiesDemo.pas | 10 +++++----- .../trunk/demos/advanced/GridDemo.pas | 4 ++-- .../demos/advanced/HeaderCustomDrawDemo.pas | 4 ++-- .../trunk/demos/advanced/Main.pas | 4 ++-- .../trunk/demos/advanced/MultilineDemo.pas | 6 +++--- .../trunk/demos/advanced/PropertiesDemo.pas | 12 ++++++------ .../trunk/demos/advanced/SpeedDemo.pas | 4 ++-- .../trunk/demos/advanced/VisibilityDemo.pas | 10 +++++----- .../demos/advanced/WindowsXPStyleDemo.pas | 10 +++++----- .../trunk/demos/dataarray/Main.pas | 6 +++--- .../trunk/demos/images/Unit1.pas | 6 +++--- .../trunk/demos/mininal/Main.pas | 7 +++---- .../trunk/demos/ole/Main.pas | 14 +++++++------- .../trunk/demos/unicode/fmain.pas | 12 ++++++------ .../trunk/demos/vtbasic/Main.pas | 4 ++-- .../trunk/demos/vtbasic/VTCheckList.pas | 4 ++-- .../trunk/demos/vtbasic/VTDBExample.pas | 18 ++++++++---------- .../trunk/demos/vtbasic/VTEditors.pas | 6 +++--- .../trunk/demos/vtbasic/VTNoData.pas | 4 ++-- .../trunk/demos/vtbasic/VTPropEdit.pas | 4 ++-- 23 files changed, 86 insertions(+), 89 deletions(-) diff --git a/components/virtualtreeview-new/trunk/demos/advanced/AlignDemo.pas b/components/virtualtreeview-new/trunk/demos/advanced/AlignDemo.pas index 887836537..c9317e672 100644 --- a/components/virtualtreeview-new/trunk/demos/advanced/AlignDemo.pas +++ b/components/virtualtreeview-new/trunk/demos/advanced/AlignDemo.pas @@ -41,7 +41,7 @@ type procedure AlignTreeGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var Index: Integer); procedure AlignTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); procedure AlignTreePaintText(Sender: TBaseVirtualTree; const Canvas: TCanvas; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType); procedure AlignTreeGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: Integer); @@ -90,7 +90,7 @@ type TAlignData = record MainColumnText, GreekText, - RTLText: UTF8String; + RTLText: String; ImageIndex: Integer; end; @@ -99,9 +99,9 @@ type // Additionally, some greek text for another column is stored here too just because I like how it looks (the text, // not the storage ;-)). var - GreekStrings: array[0..8] of UTF8String; - ArabicStrings: array[0..3] of UTF8String; - HebrewStrings: array[0..2] of UTF8String; + GreekStrings: array[0..8] of String; + ArabicStrings: array[0..3] of String; + HebrewStrings: array[0..2] of String; //---------------------------------------------------------------------------------------------------------------------- @@ -162,7 +162,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TAlignForm.AlignTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - TextType: TVSTTextType; var CellText: UTF8String); + TextType: TVSTTextType; var CellText: String); var Data: PAlignData; diff --git a/components/virtualtreeview-new/trunk/demos/advanced/DrawTreeDemo.pas b/components/virtualtreeview-new/trunk/demos/advanced/DrawTreeDemo.pas index e69532c22..72589b6cc 100644 --- a/components/virtualtreeview-new/trunk/demos/advanced/DrawTreeDemo.pas +++ b/components/virtualtreeview-new/trunk/demos/advanced/DrawTreeDemo.pas @@ -56,7 +56,7 @@ type FDriveStrings: string; function CanDisplay(const Name: String): Boolean; function GetDriveString(Index: Integer): string; - function ReadAttributes(const Name: UTF8String): Cardinal; + function ReadAttributes(const Name: String): Cardinal; procedure RescaleImage(Source, Target: TBitmap); end; @@ -78,12 +78,12 @@ type PShellObjectData = ^TShellObjectData; TShellObjectData = record FullPath, - Display: UTF8String; + Display: String; Attributes: Cardinal; OpenIndex, CloseIndex: Integer; // image indices into the system image list Image: TBitmap; - Properties: UTF8String; // some image properties, preformatted + Properties: String; // some image properties, preformatted end; //---------------------------------------------------------------------------------------------------------------------- @@ -252,7 +252,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- -function TDrawTreeForm.ReadAttributes(const Name: UTF8String): Cardinal; +function TDrawTreeForm.ReadAttributes(const Name: String): Cardinal; // Determines the attributes of the given shell object (file, folder). @@ -422,7 +422,7 @@ procedure TDrawTreeForm.VDT1DrawNode(Sender: TBaseVirtualTree; const PaintInfo: var Data: PShellObjectData; X: Integer; - S: UTF8String; + S: String; R: TRect; begin diff --git a/components/virtualtreeview-new/trunk/demos/advanced/Editors.pas b/components/virtualtreeview-new/trunk/demos/advanced/Editors.pas index 3c6a33aed..4a58d22c3 100644 --- a/components/virtualtreeview-new/trunk/demos/advanced/Editors.pas +++ b/components/virtualtreeview-new/trunk/demos/advanced/Editors.pas @@ -31,7 +31,7 @@ type PPropertyData = ^TPropertyData; TPropertyData = record ValueType: TValueType; - Value: UTF8String; // This value can actually be a date or a number too. + Value: String; // This value can actually be a date or a number too. Changed: Boolean; end; @@ -276,7 +276,7 @@ function TPropertyEditLink.EndEdit: Boolean; var Data: PPropertyData; Buffer: array[0..1024] of Char; - S: UTF8String; + S: String; begin Result := True; diff --git a/components/virtualtreeview-new/trunk/demos/advanced/GeneralAbilitiesDemo.pas b/components/virtualtreeview-new/trunk/demos/advanced/GeneralAbilitiesDemo.pas index 9c4f88219..2350d0421 100644 --- a/components/virtualtreeview-new/trunk/demos/advanced/GeneralAbilitiesDemo.pas +++ b/components/virtualtreeview-new/trunk/demos/advanced/GeneralAbilitiesDemo.pas @@ -49,9 +49,9 @@ type procedure VST2InitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates); procedure VST2InitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal); - procedure VST2NewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; Text: UTF8String); + procedure VST2NewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; Text: String); procedure VST2GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); procedure VST2PaintText(Sender: TBaseVirtualTree; const TargetCanvas: TCanvas; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType); procedure VST2GetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: Integer); @@ -99,7 +99,7 @@ type TNodeData2 = record Caption, StaticText, - ForeignText: UTF8String; + ForeignText: String; ImageIndex, Level: Integer; end; @@ -178,7 +178,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TGeneralForm.VST2GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - TextType: TVSTTextType; var CellText: UTF8String); + TextType: TVSTTextType; var CellText: String); // Returns the text as it is stored in the nodes data record. @@ -325,7 +325,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TGeneralForm.VST2NewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - Text: UTF8String); + Text: String); // The caption of a node has been changed, keep this in the node record. diff --git a/components/virtualtreeview-new/trunk/demos/advanced/GridDemo.pas b/components/virtualtreeview-new/trunk/demos/advanced/GridDemo.pas index d88e0c939..9cb155eb1 100644 --- a/components/virtualtreeview-new/trunk/demos/advanced/GridDemo.pas +++ b/components/virtualtreeview-new/trunk/demos/advanced/GridDemo.pas @@ -35,7 +35,7 @@ type procedure VST5FocusChanging(Sender: TBaseVirtualTree; OldNode, NewNode: PVirtualNode; OldColumn, NewColumn: TColumnIndex; var Allowed: Boolean); procedure VST5GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); procedure VST5InitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates); procedure VST5PaintText(Sender: TBaseVirtualTree; const TargetCanvas: TCanvas; Node: PVirtualNode; @@ -129,7 +129,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TGridForm.VST5GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - TextType: TVSTTextType; var CellText: UTF8String); + TextType: TVSTTextType; var CellText: String); var Data: PGridData; diff --git a/components/virtualtreeview-new/trunk/demos/advanced/HeaderCustomDrawDemo.pas b/components/virtualtreeview-new/trunk/demos/advanced/HeaderCustomDrawDemo.pas index b6ac8db16..7f6f065f1 100644 --- a/components/virtualtreeview-new/trunk/demos/advanced/HeaderCustomDrawDemo.pas +++ b/components/virtualtreeview-new/trunk/demos/advanced/HeaderCustomDrawDemo.pas @@ -33,7 +33,7 @@ type procedure HeaderCustomDrawTreeStateChange(Sender: TBaseVirtualTree; Enter, Leave: TVirtualTreeStates); procedure HeaderCustomDrawTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); private FBackBitmap1, FBackBitmap2, @@ -297,7 +297,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure THeaderOwnerDrawForm.HeaderCustomDrawTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; - Column: TColumnIndex; TextType: TVSTTextType; var CellText: UTF8String); + Column: TColumnIndex; TextType: TVSTTextType; var CellText: String); begin CellText := 'Some simple text.'; diff --git a/components/virtualtreeview-new/trunk/demos/advanced/Main.pas b/components/virtualtreeview-new/trunk/demos/advanced/Main.pas index eca2fd429..dc03d2c05 100644 --- a/components/virtualtreeview-new/trunk/demos/advanced/Main.pas +++ b/components/virtualtreeview-new/trunk/demos/advanced/Main.pas @@ -41,7 +41,7 @@ type var MainForm: TMainForm; -procedure LoadUnicodeStrings(const Name: string; var Strings: array of UTF8String); +procedure LoadUnicodeStrings(const Name: string; var Strings: array of String); procedure SetStatusbarText(const S: string); //---------------------------------------------------------------------------------------------------------------------- @@ -56,7 +56,7 @@ uses //---------------------------------------------------------------------------------------------------------------------- -procedure LoadUnicodeStrings(const Name: string; var Strings: array of UTF8String); +procedure LoadUnicodeStrings(const Name: string; var Strings: array of String); // Loads the Unicode strings from the resource. diff --git a/components/virtualtreeview-new/trunk/demos/advanced/MultilineDemo.pas b/components/virtualtreeview-new/trunk/demos/advanced/MultilineDemo.pas index b85fb5605..34554e7ef 100644 --- a/components/virtualtreeview-new/trunk/demos/advanced/MultilineDemo.pas +++ b/components/virtualtreeview-new/trunk/demos/advanced/MultilineDemo.pas @@ -23,7 +23,7 @@ type var InitialStates: TVirtualNodeInitStates); procedure FormCreate(Sender: TObject); procedure MLTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - TextType: TVSTTextType; var CellText: UTF8String); + TextType: TVSTTextType; var CellText: String); procedure MLTreePaintText(Sender: TBaseVirtualTree; const TargetCanvas: TCanvas; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType); procedure MLTreeEditing(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; var Allowed: Boolean); @@ -42,7 +42,7 @@ uses var - DemoText: array[0..29] of UTF8String; + DemoText: array[0..29] of String; //---------------------------------------------------------------------------------------------------------------------- @@ -73,7 +73,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TNodeForm.MLTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - TextType: TVSTTextType; var CellText: UTF8String); + TextType: TVSTTextType; var CellText: String); // Returns the text for the given node. This text was loaded at form creation time from the application resource. diff --git a/components/virtualtreeview-new/trunk/demos/advanced/PropertiesDemo.pas b/components/virtualtreeview-new/trunk/demos/advanced/PropertiesDemo.pas index f2354ea18..ec7f12568 100644 --- a/components/virtualtreeview-new/trunk/demos/advanced/PropertiesDemo.pas +++ b/components/virtualtreeview-new/trunk/demos/advanced/PropertiesDemo.pas @@ -29,17 +29,17 @@ type procedure VST3CreateEditor(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; out EditLink: IVTEditLink); procedure VST3Editing(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; var Allowed: Boolean); procedure VST3GetHint(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - var LineBreakStyle: TVTTooltipLineBreakStyle; var HintText: UTF8String); + var LineBreakStyle: TVTTooltipLineBreakStyle; var HintText: String); procedure VST3GetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var Index: Integer); procedure VST3GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); procedure VST3InitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal); procedure VST3InitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates); procedure VST3PaintText(Sender: TBaseVirtualTree; const TargetCanvas: TCanvas; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType); - procedure VST3IncrementalSearch(Sender: TBaseVirtualTree; Node: PVirtualNode; const Text: UTF8String; + procedure VST3IncrementalSearch(Sender: TBaseVirtualTree; Node: PVirtualNode; const Text: String; var Result: Integer); procedure RadioGroup1Click(Sender: TObject); procedure VST3StateChange(Sender: TBaseVirtualTree; Enter, Leave: TVirtualTreeStates); @@ -106,7 +106,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TPropertiesForm.VST3GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - TextType: TVSTTextType; var CellText: UTF8String); + TextType: TVSTTextType; var CellText: String); var Data: PPropertyData; @@ -136,7 +136,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TPropertiesForm.VST3GetHint(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - var LineBreakStyle: TVTTooltipLineBreakStyle; var HintText: UTF8String); + var LineBreakStyle: TVTTooltipLineBreakStyle; var HintText: String); begin // Add a dummy hint to the normal hint to demonstrate multiline hints. @@ -241,7 +241,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- -procedure TPropertiesForm.VST3IncrementalSearch(Sender: TBaseVirtualTree; Node: PVirtualNode; const Text: UTF8String; +procedure TPropertiesForm.VST3IncrementalSearch(Sender: TBaseVirtualTree; Node: PVirtualNode; const Text: String; var Result: Integer); var diff --git a/components/virtualtreeview-new/trunk/demos/advanced/SpeedDemo.pas b/components/virtualtreeview-new/trunk/demos/advanced/SpeedDemo.pas index 3c7d5236c..e5d3ba1af 100644 --- a/components/virtualtreeview-new/trunk/demos/advanced/SpeedDemo.pas +++ b/components/virtualtreeview-new/trunk/demos/advanced/SpeedDemo.pas @@ -38,7 +38,7 @@ type procedure ClearButtonClick(Sender: TObject); procedure AddButtonClick(Sender: TObject); procedure VST1GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); procedure VST1Change(Sender: TBaseVirtualTree; Node: PVirtualNode); procedure VST1StructureChange(Sender: TBaseVirtualTree; Node: PVirtualNode; Reason: TChangeReason); procedure DeleteSelectionButtonClick(Sender: TObject); @@ -142,7 +142,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TSpeedForm.VST1GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); begin CellText := Format('Level %d, Index %d', [Sender.GetNodeLevel(Node), Node.Index]); diff --git a/components/virtualtreeview-new/trunk/demos/advanced/VisibilityDemo.pas b/components/virtualtreeview-new/trunk/demos/advanced/VisibilityDemo.pas index d4ff4b6e2..9b74b3b2c 100644 --- a/components/virtualtreeview-new/trunk/demos/advanced/VisibilityDemo.pas +++ b/components/virtualtreeview-new/trunk/demos/advanced/VisibilityDemo.pas @@ -34,7 +34,7 @@ type procedure FormCreate(Sender: TObject); procedure RadioGroup1Click(Sender: TObject); procedure VST2GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); procedure VST3Scroll(Sender: TBaseVirtualTree; DeltaX, DeltaY: Integer); procedure VST2InitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal); procedure VST2Scroll(Sender: TBaseVirtualTree; DeltaX, DeltaY: Integer); @@ -44,7 +44,7 @@ type var Accept: Boolean); procedure Splitter2Paint(Sender: TObject); procedure VST1GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); procedure FormShow(Sender: TObject); procedure FormHide(Sender: TObject); private @@ -65,7 +65,7 @@ uses States; type PLinkData = ^TLinkData; TLinkData = record - Caption: UTF8String; + Caption: String; OtherNode: PVirtualNode; end; @@ -167,7 +167,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TVisibilityForm.VST2GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - TextType: TVSTTextType; var CellText: UTF8String); + TextType: TVSTTextType; var CellText: String); var Data: PLinkData; @@ -314,7 +314,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TVisibilityForm.VST1GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - TextType: TVSTTextType; var CellText: UTF8String); + TextType: TVSTTextType; var CellText: String); begin CellText := Format('Node Level %d, Index %d', [Sender.GetNodeLevel(Node), Node.Index]); diff --git a/components/virtualtreeview-new/trunk/demos/advanced/WindowsXPStyleDemo.pas b/components/virtualtreeview-new/trunk/demos/advanced/WindowsXPStyleDemo.pas index 85efc92e1..c90321622 100644 --- a/components/virtualtreeview-new/trunk/demos/advanced/WindowsXPStyleDemo.pas +++ b/components/virtualtreeview-new/trunk/demos/advanced/WindowsXPStyleDemo.pas @@ -41,13 +41,13 @@ type var InitialStates: TVirtualNodeInitStates); procedure XPTreeInitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal); procedure XPTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - TextType: TVSTTextType; var CellText: UTF8String); + TextType: TVSTTextType; var CellText: String); procedure XPTreeHeaderClick(Sender: TVTHeader; Column: TColumnIndex; Button: TMouseButton; Shift: TShiftState; X, Y: Integer); procedure XPTreeCompareNodes(Sender: TBaseVirtualTree; Node1, Node2: PVirtualNode; Column: TColumnIndex; var Result: Integer); procedure XPTreeGetHint(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - var LineBreakStyle: TVTTooltipLineBreakStyle; var HintText: UTF8String); + var LineBreakStyle: TVTTooltipLineBreakStyle; var HintText: String); procedure Label4Click(Sender: TObject); procedure ToolButton9Click(Sender: TObject); procedure XPTreeStateChange(Sender: TBaseVirtualTree; Enter, Leave: TVirtualTreeStates); @@ -66,7 +66,7 @@ uses type PEntry = ^TEntry; TEntry = record - Caption: UTF8String; + Caption: String; Image: Integer; Size: Int64; end; @@ -162,7 +162,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TWindowsXPForm.XPTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - TextType: TVSTTextType; var CellText: UTF8String); + TextType: TVSTTextType; var CellText: String); var Data: PEntry; @@ -242,7 +242,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TWindowsXPForm.XPTreeGetHint(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - var LineBreakStyle: TVTTooltipLineBreakStyle; var HintText: UTF8String); + var LineBreakStyle: TVTTooltipLineBreakStyle; var HintText: String); begin // Show only a dummy hint. It is just to demonstrate how to do it. diff --git a/components/virtualtreeview-new/trunk/demos/dataarray/Main.pas b/components/virtualtreeview-new/trunk/demos/dataarray/Main.pas index cb2586602..9dbb048ea 100644 --- a/components/virtualtreeview-new/trunk/demos/dataarray/Main.pas +++ b/components/virtualtreeview-new/trunk/demos/dataarray/Main.pas @@ -79,7 +79,7 @@ type NodePointer: PVirtualNode; Active: Boolean; - MyText: UTF8String; + MyText: String; RNDNumber: integer; end; @@ -111,7 +111,7 @@ type CellPaintMode: TVTCellPaintMode; CellRect: TRect; var ContentRect: TRect); procedure MyTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); procedure Button1Click(Sender: TObject); procedure MyTreeCompareNodes(Sender: TBaseVirtualTree; Node1, Node2: PVirtualNode; Column: TColumnIndex; var Result: Integer); @@ -146,7 +146,7 @@ uses procedure TForm1.MyTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); var Data: ^rTreeData; diff --git a/components/virtualtreeview-new/trunk/demos/images/Unit1.pas b/components/virtualtreeview-new/trunk/demos/images/Unit1.pas index 3f07a3dec..9b645a18b 100644 --- a/components/virtualtreeview-new/trunk/demos/images/Unit1.pas +++ b/components/virtualtreeview-new/trunk/demos/images/Unit1.pas @@ -45,7 +45,7 @@ type Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates); procedure VST1GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); procedure VST1GetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer); @@ -63,7 +63,7 @@ type PMyRec = ^TMyRec; TMyRec = record - Main: UTF8String; + Main: String; One, Two: integer; Percent : integer; Index: Integer; @@ -198,7 +198,7 @@ begin end; procedure TForm1.VST1GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; - Column: TColumnIndex; TextType: TVSTTextType; var CellText: UTF8String); + Column: TColumnIndex; TextType: TVSTTextType; var CellText: String); var Data: PMyRec; begin diff --git a/components/virtualtreeview-new/trunk/demos/mininal/Main.pas b/components/virtualtreeview-new/trunk/demos/mininal/Main.pas index dd328bbde..aa74d6875 100644 --- a/components/virtualtreeview-new/trunk/demos/mininal/Main.pas +++ b/components/virtualtreeview-new/trunk/demos/mininal/Main.pas @@ -28,7 +28,7 @@ type procedure ClearButtonClick(Sender: TObject); procedure AddButtonClick(Sender: TObject); procedure VSTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var Text: UTF8String); + var Text: String); procedure VSTFreeNode(Sender: TBaseVirtualTree; Node: PVirtualNode); procedure VSTInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates); @@ -50,7 +50,7 @@ type // Extend it to whatever your application needs. PMyRec = ^TMyRec; TMyRec = record - Caption: UTF8String; + Caption: String; end; //---------------------------------------------------------------------------------------------------------------------- @@ -126,14 +126,13 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TMainForm.VSTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var Text: UTF8String); + var Text: String); var Data: PMyRec; begin // A handler for the OnGetText event is always needed as it provides the tree with the string data to display. - // Note that we are always using UTF8String. Data := Sender.GetNodeData(Node); if Assigned(Data) then Text := Data.Caption; diff --git a/components/virtualtreeview-new/trunk/demos/ole/Main.pas b/components/virtualtreeview-new/trunk/demos/ole/Main.pas index b785dae91..79f4ac09a 100644 --- a/components/virtualtreeview-new/trunk/demos/ole/Main.pas +++ b/components/virtualtreeview-new/trunk/demos/ole/Main.pas @@ -53,14 +53,14 @@ type procedure PasteActionExecute(Sender: TObject); procedure TreeFreeNode(Sender: TBaseVirtualTree; Node: PVirtualNode); procedure Tree1GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var Text: UTF8String); + var Text: String); procedure FormCreate(Sender: TObject); procedure TreeDragDrop(Sender: TBaseVirtualTree; Source: TObject; DataObject: IDataObject; Formats: TFormatArray; Shift: TShiftState; Pt: TPoint; var Effect: Integer; Mode: TDropMode); procedure Button2Click(Sender: TObject); procedure TreeInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates); - procedure Tree1NewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; Text: UTF8String); + procedure Tree1NewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; Text: String); procedure Button3Click(Sender: TObject); procedure Tree2DragAllowed(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; var Allowed: Boolean); procedure TreeDragOver(Sender: TBaseVirtualTree; Source: TObject; Shift: TShiftState; State: TDragState; @@ -69,7 +69,7 @@ type var ItemColor: TColor; var EraseAction: TItemEraseAction); private procedure AddUnicodeText(DataObject: IDataObject; Target: TVirtualStringTree; Mode: TVTNodeAttachMode); - procedure AddVCLText(Target: TVirtualStringTree; const Text: UTF8String; Mode: TVTNodeAttachMode); + procedure AddVCLText(Target: TVirtualStringTree; const Text: String; Mode: TVTNodeAttachMode); function FindCPFormatDescription(CPFormat: Word): string; procedure InsertData(Sender: TVirtualStringTree; DataObject: IDataObject; Formats: TFormatArray; Effect: Integer; Mode: TVTNodeAttachMode); @@ -90,7 +90,7 @@ uses type PNodeData = ^TNodeData; TNodeData = record - Caption: UTF8String; + Caption: String; end; procedure ReleaseStgMedium(_para1:LPSTGMEDIUM);stdcall;external 'ole32.dll' name 'ReleaseStgMedium'; @@ -198,7 +198,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- procedure TMainForm.Tree1GetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var Text: UTF8String); + var Text: String); var Data: PNodeData; @@ -332,7 +332,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- -procedure TMainForm.AddVCLText(Target: TVirtualStringTree; const Text: UTF8String; Mode: TVTNodeAttachMode); +procedure TMainForm.AddVCLText(Target: TVirtualStringTree; const Text: String; Mode: TVTNodeAttachMode); // This method is called when the drop handler gets called with a VCL drag source. // The given text is retrieved and splitted in lines. @@ -568,7 +568,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- -procedure TMainForm.Tree1NewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; Text: UTF8String); +procedure TMainForm.Tree1NewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; Text: String); var Data: PNodeData; diff --git a/components/virtualtreeview-new/trunk/demos/unicode/fmain.pas b/components/virtualtreeview-new/trunk/demos/unicode/fmain.pas index 03386f4a7..169909918 100644 --- a/components/virtualtreeview-new/trunk/demos/unicode/fmain.pas +++ b/components/virtualtreeview-new/trunk/demos/unicode/fmain.pas @@ -39,12 +39,12 @@ type procedure FormCreate(Sender: TObject); procedure LCLTextTreeFreeNode(Sender: TBaseVirtualTree; Node: PVirtualNode); procedure LCLTextTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; - Column: TColumnIndex; TextType: TVSTTextType; var CellText: UTF8String); + Column: TColumnIndex; TextType: TVSTTextType; var CellText: String); procedure LCLTextTreeNewText(Sender: TBaseVirtualTree; Node: PVirtualNode; - Column: TColumnIndex; const NewText: UTF8String); + Column: TColumnIndex; const NewText: String); procedure WelcomeTreeFreeNode(Sender: TBaseVirtualTree; Node: PVirtualNode); procedure WelcomeTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; - Column: TColumnIndex; TextType: TVSTTextType; var CellText: UTF8String); + Column: TColumnIndex; TextType: TVSTTextType; var CellText: String); private procedure AddLCLText(const AText: String); { private declarations } @@ -106,7 +106,7 @@ end; procedure TMainForm.LCLTextTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); var Data: PLCLTextData; begin @@ -115,7 +115,7 @@ begin end; procedure TMainForm.LCLTextTreeNewText(Sender: TBaseVirtualTree; - Node: PVirtualNode; Column: TColumnIndex; const NewText: UTF8String); + Node: PVirtualNode; Column: TColumnIndex; const NewText: String); var Data: PLCLTextData; begin @@ -170,7 +170,7 @@ end; procedure TMainForm.WelcomeTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); var Data: PWelcomeData; begin diff --git a/components/virtualtreeview-new/trunk/demos/vtbasic/Main.pas b/components/virtualtreeview-new/trunk/demos/vtbasic/Main.pas index 78c7de636..6030a2d68 100644 --- a/components/virtualtreeview-new/trunk/demos/vtbasic/Main.pas +++ b/components/virtualtreeview-new/trunk/demos/vtbasic/Main.pas @@ -41,7 +41,7 @@ TfrmMain = procedure VTGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: Integer); procedure VTInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates); procedure VTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var CellText: UTF8String); + var CellText: String); procedure VTGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer); procedure VTDblClick(Sender: TObject); @@ -105,7 +105,7 @@ implementation end; procedure TfrmMain.VTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; - Column: TColumnIndex; TextType: TVSTTextType; var CellText: UTF8String); + Column: TColumnIndex; TextType: TVSTTextType; var CellText: String); begin Celltext := FCaptions[Node.Index]; {this is where we say what the text to display} end; diff --git a/components/virtualtreeview-new/trunk/demos/vtbasic/VTCheckList.pas b/components/virtualtreeview-new/trunk/demos/vtbasic/VTCheckList.pas index 8599cde4f..11b5dffaa 100644 --- a/components/virtualtreeview-new/trunk/demos/vtbasic/VTCheckList.pas +++ b/components/virtualtreeview-new/trunk/demos/vtbasic/VTCheckList.pas @@ -36,7 +36,7 @@ interface procedure VTGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: Integer); procedure VTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; - Column: TColumnIndex; TextType: TVSTTextType; var CellText: UTF8String); + Column: TColumnIndex; TextType: TVSTTextType; var CellText: String); procedure VTInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates); procedure btnOkClick(Sender: TObject); @@ -127,7 +127,7 @@ implementation end; procedure TfrmVTCheckList.VTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; - Column: TColumnIndex; TextType: TVSTTextType; var CellText: UTF8String); + Column: TColumnIndex; TextType: TVSTTextType; var CellText: String); begin Celltext := FCaptions[Node.Index]; {top-level} end; diff --git a/components/virtualtreeview-new/trunk/demos/vtbasic/VTDBExample.pas b/components/virtualtreeview-new/trunk/demos/vtbasic/VTDBExample.pas index 0c5139354..1660a5e5b 100644 --- a/components/virtualtreeview-new/trunk/demos/vtbasic/VTDBExample.pas +++ b/components/virtualtreeview-new/trunk/demos/vtbasic/VTDBExample.pas @@ -55,7 +55,7 @@ interface procedure AddButtonClick(Sender: TObject); procedure FormCreate(Sender: TObject); procedure VTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var Text: UTF8String); + var Text: String); procedure VTFreeNode(Sender: TBaseVirtualTree; Node: PVirtualNode); procedure VTInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates); @@ -72,7 +72,7 @@ interface procedure VTCompareNodes(Sender: TBaseVirtualTree; Node1, Node2: PVirtualNode; Column: TColumnIndex; var Result: Integer); procedure VTGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: Integer); - procedure VTNewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; NewText: UTF8String); + procedure VTNewText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; NewText: String); procedure VTInitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal); procedure btnHasChildrenClick(Sender: TObject); procedure btnToggleVisibilityClick(Sender: TObject); @@ -80,7 +80,7 @@ interface procedure VTFocusChanging(Sender: TBaseVirtualTree; OldNode, NewNode: PVirtualNode; OldColumn, NewColumn: TColumnIndex; var Allowed: Boolean); procedure chkDynHtClick(Sender: TObject); - procedure VTIncrementalSearch(Sender: TBaseVirtualTree; Node: PVirtualNode; const SearchText: UTF8String; + procedure VTIncrementalSearch(Sender: TBaseVirtualTree; Node: PVirtualNode; const SearchText: String; var Result: Integer); private @@ -214,7 +214,8 @@ implementation Finalize( Data^ ); end; - procedure TfrmVTDBExample.VTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; var Text: UTF8String); + procedure TfrmVTDBExample.VTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; + Column: TColumnIndex; TextType: TVSTTextType; var Text: String); var Data : PBasicNodeRec; bnd : TBasicNodeAddData; @@ -369,7 +370,7 @@ implementation end; procedure TfrmVTDBExample.VTNewText(Sender: TBaseVirtualTree; Node: PVirtualNode; - Column: TColumnIndex; NewText: UTF8String); + Column: TColumnIndex; NewText: String); var Data : PBasicNodeRec; begin @@ -483,7 +484,7 @@ implementation end; procedure TfrmVTDBExample.VTIncrementalSearch(Sender: TBaseVirtualTree; - Node: PVirtualNode; const SearchText: UTF8String; var Result: Integer); + Node: PVirtualNode; const SearchText: String; var Result: Integer); function Min(const A, B: Integer): Integer; {save us linking in math.pas} begin @@ -495,14 +496,11 @@ implementation var sCompare1, sCompare2 : string; - DisplayText : UTF8String; + DisplayText : String; begin VT.IncrementalSearchDirection := sdForward; // note can be backward - // Note: This code requires a proper Unicode/UTF8String comparation routine which I did not want to link here for - // size and clarity reasons. For now strings are (implicitely) converted to ANSI to make the comparation work. - // Search is not case sensitive. VTGetText( Sender, Node, 0 {Column}, ttNormal, DisplayText ); sCompare1 := SearchText; sCompare2 := DisplayText; diff --git a/components/virtualtreeview-new/trunk/demos/vtbasic/VTEditors.pas b/components/virtualtreeview-new/trunk/demos/vtbasic/VTEditors.pas index b8748e56d..dcf311aa2 100644 --- a/components/virtualtreeview-new/trunk/demos/vtbasic/VTEditors.pas +++ b/components/virtualtreeview-new/trunk/demos/vtbasic/VTEditors.pas @@ -30,7 +30,7 @@ interface TPropertyData = record ValueType: TValueType; - Value : UTF8String; // This value can actually be a date or a number too. + Value : String; // This value can actually be a date or a number too. Changed : Boolean; end; PPropertyData = ^TPropertyData; @@ -324,7 +324,7 @@ implementation var Data: PPropertyData; Buffer: array[0..1024] of Char; - S: UTF8String; + S: String; P: TPoint; Dummy: Integer; begin @@ -431,7 +431,7 @@ implementation var Data: PGridData; Buffer: array[0..1024] of Char; - S: UTF8String; + S: String; I: Integer; begin diff --git a/components/virtualtreeview-new/trunk/demos/vtbasic/VTNoData.pas b/components/virtualtreeview-new/trunk/demos/vtbasic/VTNoData.pas index 47bb72aaa..0d4f76ef2 100644 --- a/components/virtualtreeview-new/trunk/demos/vtbasic/VTNoData.pas +++ b/components/virtualtreeview-new/trunk/demos/vtbasic/VTNoData.pas @@ -40,7 +40,7 @@ interface procedure VTGetNodeDataSize(Sender: TBaseVirtualTree; var NodeDataSize: Integer); procedure VTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; - Column: TColumnIndex; TextType: TVSTTextType; var CellText: UTF8String); + Column: TColumnIndex; TextType: TVSTTextType; var CellText: String); procedure VTGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtualNode; Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer); procedure VTInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates); @@ -128,7 +128,7 @@ implementation end; procedure TfrmVTNoData.VTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; - Column: TColumnIndex; TextType: TVSTTextType; var CellText: UTF8String); + Column: TColumnIndex; TextType: TVSTTextType; var CellText: String); const aAnimOpts : array[0..Ord(High(TVTAnimationOption ))] of string[25] = ( 'Animated Toggle', diff --git a/components/virtualtreeview-new/trunk/demos/vtbasic/VTPropEdit.pas b/components/virtualtreeview-new/trunk/demos/vtbasic/VTPropEdit.pas index d2b9ba627..ae9d474fb 100644 --- a/components/virtualtreeview-new/trunk/demos/vtbasic/VTPropEdit.pas +++ b/components/virtualtreeview-new/trunk/demos/vtbasic/VTPropEdit.pas @@ -82,7 +82,7 @@ interface procedure VTCreateEditor(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; out EditLink: IVTEditLink); procedure VTEditing(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; var Allowed: Boolean); procedure VTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; TextType: TVSTTextType; - var Text: UTF8String); + var Text: String); procedure VTInitChildren(Sender: TBaseVirtualTree; Node: PVirtualNode; var ChildCount: Cardinal); procedure VTInitNode(Sender: TBaseVirtualTree; ParentNode, Node: PVirtualNode; var InitialStates: TVirtualNodeInitStates); @@ -241,7 +241,7 @@ implementation end; procedure TfrmVTPropEdit.VTGetText(Sender: TBaseVirtualTree; Node: PVirtualNode; Column: TColumnIndex; - TextType: TVSTTextType; var Text: UTF8String); + TextType: TVSTTextType; var Text: String); var Data: PPropertyData; ped : TVTPropEditData;