diff --git a/components/virtualtreeview-unstable/VirtualTrees.pas b/components/virtualtreeview-unstable/VirtualTrees.pas index 2cabf4093..21f58a6a1 100644 --- a/components/virtualtreeview-unstable/VirtualTrees.pas +++ b/components/virtualtreeview-unstable/VirtualTrees.pas @@ -2510,6 +2510,7 @@ TBaseVirtualTree = class(TCustomControl) ChildrenOnly: Boolean): PVirtualNode; overload; procedure CopyToClipBoard; virtual; procedure CutToClipBoard; virtual; + procedure DefaultHandler(var AMessage); override; procedure DeleteChildren(Node: PVirtualNode; ResetHasChildren: Boolean = False); procedure DeleteNode(Node: PVirtualNode; Reindex: Boolean = True); procedure DeleteSelectedNodes; virtual; @@ -15421,10 +15422,7 @@ begin Logger.EnterMethod([lcScroll],'CMMouseWheel'); StopWheelPanning; - //todo: - //The only thing that inherited WMMouseWheel does is to call DoMouseWheel - //in the other hand it call a DefaultHandler that causes bug here. So skip it - //inherited WMMouseWheel(Message); + inherited WMMouseWheel(Message); if Message.Result = 0 then begin @@ -24405,6 +24403,12 @@ end; //---------------------------------------------------------------------------------------------------------------------- +procedure TBaseVirtualTree.DefaultHandler(var AMessage); +begin + //used to avoid default handler of LM_MOUSEWHEEL +end; + + procedure TBaseVirtualTree.DeleteChildren(Node: PVirtualNode; ResetHasChildren: Boolean = False); // Removes all children and their children from memory without changing the vsHasChildren style by default. diff --git a/components/virtualtreeview-unstable/demos/vtbasic/vtbasic.lpi b/components/virtualtreeview-unstable/demos/vtbasic/vtbasic.lpi index bf6be0a11..83de8a2c1 100644 --- a/components/virtualtreeview-unstable/demos/vtbasic/vtbasic.lpi +++ b/components/virtualtreeview-unstable/demos/vtbasic/vtbasic.lpi @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ - + @@ -23,7 +23,7 @@ - + @@ -109,6 +109,7 @@ +