Fixed issue #723: Turn event OnAfterNodeExport into a procedure. This…

… is a breaking chnage.
JAM-Software · Oct 29, 2017 · bb6b9e1 · bb6b9e1
1 parent 069687f
commit bb6b9e1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Source/VirtualTrees.Export.pas b/Source/VirtualTrees.Export.pas
@@ -305,11 +305,12 @@   TCustomVirtualStringTreeCracker = class(TCustomVirtualStringTree)
     Run := Save;
     while Assigned(Run) and not CrackTree.OperationCanceled do
     begin
-      if ((not CrackTree.CanExportNode(Run)) or (Assigned(CrackTree.OnBeforeNodeExport) and (not CrackTree.OnBeforeNodeExport(CrackTree, etHTML, Run)))) then
+      if ((not CrackTree.CanExportNode(Run)) or Assigned(CrackTree.OnBeforeNodeExport)) then
       begin
         Run := GetNextNode(Run);
         Continue;
       end;
+      CrackTree.OnBeforeNodeExport(CrackTree, etHTML, Run);
       Level := CrackTree.GetNodeLevel(Run);
       Buffer.Add(' <tr class="default">');
       Buffer.AddNewLine;
@@ -678,12 +679,12 @@ function ContentToRTF(Tree: TCustomVirtualStringTree; Source: TVSTTextSourceType
     Run := Save;
     while Assigned(Run) and not CrackTree.OperationCanceled do
     begin
-      if ((not CrackTree.CanExportNode(Run)) or
-         (Assigned(CrackTree.OnBeforeNodeExport) and (not CrackTree.OnBeforeNodeExport(CrackTree, etRTF, Run)))) then
+      if ((not CrackTree.CanExportNode(Run)) or Assigned(CrackTree.OnBeforeNodeExport)) then
       begin
         Run := GetNextNode(Run);
         Continue;
       end;
+      CrackTree.OnBeforeNodeExport(CrackTree, etRTF, Run);
       I := 0;
       while not RenderColumns or (I < Length(Columns)) do
       begin

diff --git a/Source/VirtualTrees.pas b/Source/VirtualTrees.pas
@@ -1593,7 +1593,7 @@   THeaderPaintInfo = record
     etCustom // supported by external tools
   );
 
-  TVTNodeExportEvent   = function (Sender: TBaseVirtualTree; aExportType: TVTExportType; Node: PVirtualNode): Boolean of object;
+  TVTNodeExportEvent   = procedure (Sender: TBaseVirtualTree; aExportType: TVTExportType; Node: PVirtualNode) of object;
   TVTColumnExportEvent = procedure (Sender: TBaseVirtualTree; aExportType: TVTExportType; Column: TVirtualTreeColumn) of object;
   TVTTreeExportEvent   = procedure(Sender: TBaseVirtualTree; aExportType: TVTExportType) of object;