diff --git a/components/virtualtreeview-unstable/demos/dataarray/Main.lfm b/components/virtualtreeview-unstable/demos/dataarray/Main.lfm index a1644b37f..b00d20910 100644 --- a/components/virtualtreeview-unstable/demos/dataarray/Main.lfm +++ b/components/virtualtreeview-unstable/demos/dataarray/Main.lfm @@ -94,9 +94,27 @@ object Form1: TForm1 Left = 3 Height = 321 Top = 8 - Width = 581 + Width = 605 Anchors = [akTop, akLeft, akRight, akBottom] AutoScrollDelay = 1 + BorderStyle = bsSingle + DefaultText = 'Node' + Header.Columns = < + item + Text = 'Text' + Width = 150 + end + item + Options = [coDraggable, coEnabled, coParentBidiMode, coParentColor, coResizable, coShowDropMark, coVisible] + Position = 1 + Text = 'Pointers' + Width = 300 + end + item + Position = 2 + Text = 'Random' + Width = 100 + end> Header.Font.Height = -11 Header.Font.Name = 'MS Sans Serif' Header.Options = [hoColumnResize, hoDblClickResize, hoDrag, hoShowSortGlyphs, hoVisible] @@ -113,21 +131,5 @@ object Form1: TForm1 OnGetText = MyTreeGetText OnPaintText = MyTreePaintText OnHeaderClick = MyTreeHeaderClick - Columns = < - item - Width = 150 - WideText = 'Text' - end - item - Options = [coDraggable, coEnabled, coParentBidiMode, coParentColor, coResizable, coShowDropMark, coVisible] - Position = 1 - Width = 300 - WideText = 'Pointers' - end - item - Position = 2 - Width = 100 - WideText = 'Random' - end> end end diff --git a/components/virtualtreeview-unstable/demos/dataarray/Main.pas b/components/virtualtreeview-unstable/demos/dataarray/Main.pas index c3afadcb8..cb2586602 100644 --- a/components/virtualtreeview-unstable/demos/dataarray/Main.pas +++ b/components/virtualtreeview-unstable/demos/dataarray/Main.pas @@ -79,7 +79,7 @@ type NodePointer: PVirtualNode; Active: Boolean; - MyText: WideString; + MyText: UTF8String; 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: WideString); + var CellText: UTF8String); 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: WideString); + var CellText: UTF8String); var Data: ^rTreeData; diff --git a/components/virtualtreeview-unstable/demos/dataarray/dataarray.lpi b/components/virtualtreeview-unstable/demos/dataarray/dataarray.lpi index 4cb0f32db..df3ef9c46 100644 --- a/components/virtualtreeview-unstable/demos/dataarray/dataarray.lpi +++ b/components/virtualtreeview-unstable/demos/dataarray/dataarray.lpi @@ -2,10 +2,11 @@ - + + @@ -46,7 +47,6 @@ -