Now using NodeParent[] instead of TVirtualNode.Parent. Related to #831

Author: joachimmarder

Demos/Advanced/AlignDemo.pas

@@ -152,7 +152,7 @@ procedure TAlignForm.AlignTreePaintText(Sender: TBaseVirtualTree; const Canvas:
       Canvas.Font.Color := clSilver;
     2:
       begin
-        if not Odd(Node.Parent.Index) then
+        if not Odd(Sender.NodeParent[Node].Index) then
           Canvas.Font := FArabicFont
         else
           Canvas.Font := FHebrewFont;
@@ -162,7 +162,7 @@ procedure TAlignForm.AlignTreePaintText(Sender: TBaseVirtualTree; const Canvas:
   // Reset the text color for selected and drop target nodes.
   if ((Node = Sender.DropTargetNode) or (vsSelected in Node.States)) and (Column = Sender.FocusedColumn) then
     Canvas.Font.Color := clHighlightText;
-  if Node.Parent = Sender.RootNode then
+  if Sender.NodeParent[Node] = nil then
     Canvas.Font.Style := [fsBold];
 end;
 

Demos/Advanced/DrawTreeDemo.pas

@@ -493,7 +493,7 @@ procedure TDrawTreeForm.VDT1GetNodeWidth(Sender: TBaseVirtualTree; Canvas: TCanv
     case Column of
       0:
         begin
-          if Node.Parent = Sender.RootNode then
+          if Sender.NodeParent[Node] = nil then
             NodeWidth := Canvas.TextWidth(Data.FullPath) + 2 * AMargin
           else
             NodeWidth := Canvas.TextWidth(ExtractFileName(Data.FullPath)) + 2 * AMargin;

Demos/Advanced/Editors.pas

@@ -286,7 +286,7 @@ function TPropertyEditLink.EndEdit: Boolean;
 begin
   Result := True;
 
-  Data := FTree.GetNodeData(FNode);
+  Data := FNode.GetData();
   if FEdit is TComboBox then
     S := TComboBox(FEdit).Text
   else
@@ -329,7 +329,7 @@ function TPropertyEditLink.PrepareEdit(Tree: TBaseVirtualTree; Node: PVirtualNod
   // determine what edit type actually is needed
   FEdit.Free;
   FEdit := nil;
-  Data := FTree.GetNodeData(Node);
+  Data := Node.GetData();
   case Data.ValueType of
     vtString:
       begin
@@ -455,7 +455,7 @@ function TGridEditLink.EndEdit: Boolean;
 
 begin
   Result := True;
-  Data := FTree.GetNodeData<TGridData>(FNode);
+  Data := FNode.GetData<TGridData>();
   if FEdit is TComboBox then
   begin
     S := TComboBox(FEdit).Text;

Demos/Advanced/PropertiesDemo.pas

@@ -10,7 +10,7 @@ interface
 
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, VirtualTrees, ImgList, ExtCtrls, UITypes;
+  StdCtrls, VirtualTrees, ImgList, ExtCtrls, UITypes, System.ImageList;
 
 const
   // Helper message to decouple node change handling from edit handling.
@@ -125,7 +125,7 @@ procedure TPropertiesForm.VST3GetText(Sender: TBaseVirtualTree; Node: PVirtualNo
   if TextType = ttNormal then
     case Column of
       0:
-        if Node.Parent = Sender.RootNode then
+        if Sender.NodeParent[Node] = nil then
         begin
           // root nodes
           if Node.Index = 0 then
@@ -134,7 +134,7 @@ procedure TPropertiesForm.VST3GetText(Sender: TBaseVirtualTree; Node: PVirtualNo
             CellText := 'Origin';
         end
         else
-          CellText := PropertyTexts[Node.Parent.Index, Node.Index, ptkText];
+          CellText := PropertyTexts[Sender.NodeParent[Node].Index, Node.Index, ptkText];
       1:
         begin
           Data := Sender.GetNodeData(Node);
@@ -150,9 +150,9 @@ procedure TPropertiesForm.VST3GetHint(Sender: TBaseVirtualTree; Node: PVirtualNo
 
 begin
   // Add a dummy hint to the normal hint to demonstrate multiline hints.
-  if (Column = 0) and (Node.Parent <> Sender.RootNode) then
+  if (Column = 0) and (Sender.NodeParent[Node] <> nil) then
   begin
-    HintText := PropertyTexts[Node.Parent.Index, Node.Index, ptkHint];
+    HintText := PropertyTexts[Sender.NodeParent[Node].Index, Node.Index, ptkHint];
     { Related to #Issue 623
       Observed when solving issue #623. For hmToolTip, the multi-line mode
       depends on the node's multi-lin emode. Hence, append a line only
@@ -177,7 +177,7 @@ procedure TPropertiesForm.VST3GetImageIndex(Sender: TBaseVirtualTree; Node: PVir
 begin
   if (Kind in [ikNormal, ikSelected]) and (Column = 0) then
   begin
-    if Node.Parent = Sender.RootNode then
+    if Sender.NodeParent[Node] = nil then
       Index := 12 // root nodes, this is an open folder
     else
     begin
@@ -201,7 +201,7 @@ procedure TPropertiesForm.VST3Editing(Sender: TBaseVirtualTree; Node: PVirtualNo
   with Sender do
   begin
     Data := GetNodeData(Node);
-    Allowed := (Node.Parent <> RootNode) and (Column = 1) and (Data.ValueType <> vtNone);
+    Allowed := (Sender.NodeParent[Node] <> nil) and (Column = 1) and (Data.ValueType <> vtNone);
   end;
 end;
 
@@ -213,7 +213,7 @@ procedure TPropertiesForm.VST3Change(Sender: TBaseVirtualTree; Node: PVirtualNod
   with Sender do
   begin
     // Start immediate editing as soon as another node gets focused.
-    if Assigned(Node) and (Node.Parent <> RootNode) and not (tsIncrementalSearching in TreeStates) then
+    if Assigned(Node) and (Sender.NodeParent[Node] <> nil) and not (tsIncrementalSearching in TreeStates) then
     begin
       // We want to start editing the currently selected node. However it might well happen that this change event
       // here is caused by the node editor if another node is currently being edited. It causes trouble
@@ -249,7 +249,7 @@ procedure TPropertiesForm.VST3PaintText(Sender: TBaseVirtualTree; const TargetCa
 
 begin
   // Make the root nodes underlined and draw changed nodes in bold style.
-  if Node.Parent = Sender.RootNode then
+  if Sender.NodeParent[Node] = nil then
     TargetCanvas.Font.Style := [fsUnderline]
   else
   begin
@@ -274,7 +274,7 @@ procedure TPropertiesForm.VST3IncrementalSearch(Sender: TBaseVirtualTree; Node:
   S := SearchText;
   SetStatusbarText('Searching for: ' + S);
 
-  if Node.Parent = Sender.RootNode then
+  if Sender.NodeParent[Node] = nil then
   begin
     // root nodes
     if Node.Index = 0 then
@@ -284,7 +284,7 @@ procedure TPropertiesForm.VST3IncrementalSearch(Sender: TBaseVirtualTree; Node:
   end
   else
   begin
-    PropText := PropertyTexts[Node.Parent.Index, Node.Index, ptkText];
+    PropText := PropertyTexts[Sender.NodeParent[Node].Index, Node.Index, ptkText];
   end;
 
   // By using StrLIComp we can specify a maximum length to compare. This allows us to find also nodes

Demos/Advanced/WindowsXPStyleDemo.pas

@@ -104,12 +104,12 @@ procedure TWindowsXPForm.XPTreeGetImageIndex(Sender: TBaseVirtualTree; Node: PVi
   Data := Sender.GetNodeData(Node);
   case Kind of
     ikNormal, ikSelected:
-      if (Column = 0) and (Node.Parent = Sender.RootNode) then
+      if (Column = 0) and (Sender.NodeParent[Node] = nil) then
         Index := Data.Image;
     ikState:
       case Column of
         0:
-          if Node.Parent <> Sender.RootNode then
+          if Sender.NodeParent[Node] <> nil then
             Index := 21;
       end;
   end;
@@ -168,15 +168,15 @@ procedure TWindowsXPForm.XPTreeGetText(Sender: TBaseVirtualTree; Node: PVirtualN
   Data := Sender.GetNodeData(Node);
   case Column of
     0:
-      if Node.Parent = Sender.RootNode then
+      if Sender.NodeParent[Node] = nil then
         CellText := Data.Caption
       else
         CellText := 'More entries';
     1:
-      if Node.Parent = Sender.RootNode then
+      if Sender.NodeParent[Node] = nil then
         CellText := FloatToStr(Data.Size / 1000) + ' MB';
     2:
-      if Node.Parent = Sender.RootNode then
+      if Sender.NodeParent[Node] = nil then
         CellText := 'System Folder';
   end;
 end;