Change for #832: Turn TVirtualNode.ChildCount into a readonly property…

Author: joachimmarder

Source/VirtualTrees.BaseTree.pas

@@ -5062,7 +5062,7 @@ procedure TBaseVirtualTree.SetChildCount(Node: PVirtualNode; NewChildCount: Card
             AdjustTotalHeight(Node, NewHeight, False);
 
           AdjustTotalCount(Node, Count, True);
-          Node.ChildCount := NewChildCount;
+          Node.SetChildCount(NewChildCount);
           if (FUpdateCount = 0) and (toAutoSort in FOptions.AutoOptions) and (FHeader.SortColumn > InvalidColumn) then
             Sort(Node, FHeader.SortColumn, FHeader.SortDirection, True);
 
@@ -5687,7 +5687,7 @@ procedure TBaseVirtualTree.SetRootNodeCount(Value: Cardinal);
   // Don't set the root node count until all other properties (in particular the OnInitNode event) have been set.
   if csLoading in ComponentState then
   begin
-    FRoot.ChildCount := Value;
+    FRoot.SetChildCount(Value);
     DoStateChange([tsNeedRootCountUpdate]);
   end
   else
@@ -13864,7 +13864,7 @@ procedure TBaseVirtualTree.InternalConnectNode(Node, Destination: PVirtualNode;
     Node.States := Node.States - [vsChecking, vsCutOrCopy, vsDeleting];
 
     if (Mode <> amNoWhere) then begin
-      System.Inc(Node.Parent.ChildCount);
+      Node.Parent.SetChildCount(Node.Parent.ChildCount + 1);
       Include(Node.Parent.States, vsHasChildren);
       AdjustTotalCount(Node.Parent, Node.TotalCount, True);
 
@@ -13940,7 +13940,7 @@ procedure TBaseVirtualTree.InternalDisconnectNode(Node: PVirtualNode; KeepFocus:
     // Some states are only temporary so take them out.
     Node.States := Node.States - [vsChecking];
     Parent := Node.Parent;
-    System.Dec(Parent.ChildCount);
+    Parent.SetChildCount(Parent.ChildCount - 1);
     AdjustHeight := (vsExpanded in Parent.States) and (vsVisible in Node.States);
     if Parent.ChildCount = 0 then
     begin
@@ -14073,7 +14073,7 @@ procedure TBaseVirtualTree.Loaded;
     IsReadOnly := toReadOnly in FOptions.MiscOptions;
     FOptions.InternalSetMiscOptions(FOptions.MiscOptions - [toReadOnly]);
     LastRootCount := FRoot.ChildCount;
-    FRoot.ChildCount := 0;
+    FRoot.SetChildCount(0);
     BeginUpdate;
     SetChildCount(FRoot, LastRootCount);
     EndUpdate;
@@ -15119,7 +15119,7 @@ function TBaseVirtualTree.ReadChunk(Stream: TStream; Version: Integer; Node: PVi
           Align := ChunkBody.Align;
           CheckState := ChunkBody.CheckState;
           CheckType := ChunkBody.CheckType;
-          ChildCount := ChunkBody.ChildCount;
+          SetChildCount(ChunkBody.ChildCount);
 
           // Create and read child nodes.
           while ChunkBody.ChildCount > 0 do
@@ -16901,7 +16901,7 @@ procedure TBaseVirtualTree.DeleteChildren(Node: PVirtualNode; ResetHasChildren:
         Exclude(Node.States, vsHasChildren);
       if Node <> FRoot then
         Exclude(Node.States, vsExpanded);
-      Node.ChildCount := 0;
+      Node.SetChildCount(0);
       if (Node = FRoot) or (vsDeleting in Node.States) then
       begin
         Node.TotalHeight := FDefaultNodeHeight + NodeHeight[Node];

Source/VirtualTrees.Types.pas

@@ -886,8 +886,8 @@   TScrollBarOptions = class(TPersistent)
   TVirtualNode = packed record
   private
     fIndex: Cardinal;         // index of node with regard to its parent
+    fChildCount: Cardinal;    // number of child nodes
   public
-    ChildCount: Cardinal;    // number of child nodes
     NodeHeight: TDimension;  // height in pixels
     States: TVirtualNodeStates; // states describing various properties of the node (expanded, initialized etc.)
     Align: Byte;             // line/button alignment
@@ -916,7 +916,9 @@   TScrollBarOptions = class(TPersistent)
     procedure SetFirstChild(const pFirstChild: PVirtualNode); inline; //internal method, do not call directly
     procedure SetLastChild(const pLastChild: PVirtualNode); inline; //internal method, do not call directly
     procedure SetIndex(const pIndex: Cardinal); inline;       //internal method, do not call directly.
+    procedure SetChildCount(const pCount: Cardinal); inline; //internal method, do not call directly.
     property Index: Cardinal read fIndex;
+    property ChildCount: Cardinal read fChildCount;
     property Parent: PVirtualNode read fParent;
     property PrevSibling: PVirtualNode read fPrevSibling;
     property NextSibling: PVirtualNode read fNextSibling;
@@ -1164,6 +1166,11 @@ procedure TVirtualNode.SetData(pUserData: Pointer);
 
 //----------------------------------------------------------------------------------------------------------------------
 
+procedure TVirtualNode.SetChildCount(const pCount: Cardinal);
+begin
+  fChildCount := pCount;
+end;
+
 procedure TVirtualNode.SetData(const pUserData: IInterface);