From f445c638b8523067b3d339c3faf54e8daeff6b11 Mon Sep 17 00:00:00 2001
From: blikblum <blikblum@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Sun, 22 Jun 2014 14:45:42 +0000
Subject: [PATCH] * Enable WMCancelMode, Issue 26216

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3214 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../branches/4.8/VirtualTrees.pas                    |  7 +++----
 .../virtualtreeview-new/trunk/VirtualTrees.pas       | 12 +++++++-----
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas b/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
index d1580ebea..644ac2d26 100644
--- a/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
+++ b/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas
@@ -2488,7 +2488,7 @@ type
     procedure TVMGetItemRect(var Message: TLMessage); message TVM_GETITEMRECT;
     procedure TVMGetNextItem(var Message: TLMessage); message TVM_GETNEXTITEM;
     {$endif}
-    procedure WMCancelMode(var Message: TLMNoParams); message LM_CANCELMODE;
+    procedure WMCancelMode(var Message: TLMessage); message LM_CANCELMODE;
     procedure WMChangeState(var Message: TLMessage); message WM_CHANGESTATE;
     procedure WMChar(var Message: TLMChar); message LM_CHAR;
     procedure WMContextMenu(var Message: TLMContextMenu); message LM_CONTEXTMENU;
@@ -15276,7 +15276,7 @@ end;
 
 //----------------------------------------------------------------------------------------------------------------------
 
-procedure TBaseVirtualTree.WMCancelMode(var Message: TLMNoParams);
+procedure TBaseVirtualTree.WMCancelMode(var Message: TLMessage);
 
 begin
   {$ifdef DEBUG_VTV}Logger.EnterMethod([lcMessages],'WMCancelMode');{$endif}
@@ -15290,8 +15290,7 @@ begin
 
   DoStateChange([], [tsClearPending, tsEditPending, tsOLEDragPending, tsVCLDragPending, tsDrawSelecting,
     tsDrawSelPending, tsIncrementalSearching]);
-  //lcl does not has a inherited procedure
-  //inherited WMCancelMode(Message);
+  inherited WMCancelMode(Message);
   {$ifdef DEBUG_VTV}Logger.ExitMethod([lcMessages],'WMCancelMode');{$endif}
 end;
 
diff --git a/components/virtualtreeview-new/trunk/VirtualTrees.pas b/components/virtualtreeview-new/trunk/VirtualTrees.pas
index 9d532df85..af998904b 100644
--- a/components/virtualtreeview-new/trunk/VirtualTrees.pas
+++ b/components/virtualtreeview-new/trunk/VirtualTrees.pas
@@ -2098,6 +2098,9 @@ type
   TGetNextNodeProc = function(Node: PVirtualNode; ConsiderChildrenAbove: Boolean = False): PVirtualNode of object;
 
   // ----- TBaseVirtualTree
+
+  { TBaseVirtualTree }
+
   TBaseVirtualTree = class(TCustomControl)
   private
     //FBorderStyle: TBorderStyle;
@@ -2521,7 +2524,7 @@ type
     procedure TVMGetItemRect(var Message: TLMessage); message TVM_GETITEMRECT;
     procedure TVMGetNextItem(var Message: TLMessage); message TVM_GETNEXTITEM;
     {$endif}
-    procedure WMCancelMode(var Message: TLMNoParams); message LM_CANCELMODE;
+    procedure WMCancelMode(var Message: TLMessage); message LM_CANCELMODE;
     procedure WMChangeState(var Message: TLMessage); message WM_CHANGESTATE;
     procedure WMChar(var Message: TLMChar); message LM_CHAR;
     procedure WMContextMenu(var Message: TLMContextMenu); message LM_CONTEXTMENU;
@@ -15499,7 +15502,7 @@ end;
 
 //----------------------------------------------------------------------------------------------------------------------
 
-procedure TBaseVirtualTree.WMCancelMode(var Message: TLMNoParams);
+procedure TBaseVirtualTree.WMCancelMode(var Message: TLMessage);
 
 begin
   {$ifdef DEBUG_VTV}Logger.EnterMethod([lcMessages],'WMCancelMode');{$endif}
@@ -15513,8 +15516,7 @@ begin
 
   DoStateChange([], [tsClearPending, tsEditPending, tsOLEDragPending, tsVCLDragPending, tsDrawSelecting,
     tsDrawSelPending, tsIncrementalSearching]);
-  //lcl does not has a inherited procedure
-  //inherited WMCancelMode(Message);
+  inherited WMCancelMode(Message);
   {$ifdef DEBUG_VTV}Logger.ExitMethod([lcMessages],'WMCancelMode');{$endif}
 end;
 
@@ -20689,7 +20691,7 @@ end;
 
 //----------------------------------------------------------------------------------------------------------------------
 
-function TBaseVirtualTree.GetOperationCanceled;
+function TBaseVirtualTree.GetOperationCanceled: Boolean;
 
 begin
   Result := FOperationCanceled and (FOperationCount > 0);