From a652cadbc2d58aed13ff3b24b6cc24acca5881e6 Mon Sep 17 00:00:00 2001 From: blikblum Date: Sun, 14 Oct 2012 20:59:12 +0000 Subject: [PATCH] Hopefully fixes compilation with fpc 2.6.1. Issue 22307 git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2555 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/virtualtreeview-new/branches/4.8/VirtualTrees.pas | 2 +- .../branches/4.8/include/intf/win32/vtvdragmanager.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas b/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas index 1be74f1fa..350f840fa 100644 --- a/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas +++ b/components/virtualtreeview-new/branches/4.8/VirtualTrees.pas @@ -1044,7 +1044,7 @@ type function DragOver(KeyState: LongWord; Pt: TPoint; var Effect: LongWord): HResult; stdcall; function Drop(const DataObject: IDataObject; KeyState: LongWord; Pt: TPoint; var Effect: LongWord): HResult; stdcall; procedure ForceDragLeave; stdcall; - {$IF (FPC_FULLVERSION < 020701) and DEFINED(LCLWin32)} + {$IF (FPC_FULLVERSION < 020601) and DEFINED(LCLWin32)} function GiveFeedback(Effect: Longint): HResult; stdcall; function QueryContinueDrag(EscapePressed: BOOL; KeyState: Longint): HResult; stdcall; {$ELSE} diff --git a/components/virtualtreeview-new/branches/4.8/include/intf/win32/vtvdragmanager.inc b/components/virtualtreeview-new/branches/4.8/include/intf/win32/vtvdragmanager.inc index 464a785f7..9014938ff 100644 --- a/components/virtualtreeview-new/branches/4.8/include/intf/win32/vtvdragmanager.inc +++ b/components/virtualtreeview-new/branches/4.8/include/intf/win32/vtvdragmanager.inc @@ -686,7 +686,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- -{$IF FPC_FULLVERSION < 020701} +{$IF FPC_FULLVERSION < 020601} function TVTDragManager.GiveFeedback(Effect: Longint): HResult; {$ELSE} function TVTDragManager.GiveFeedback(Effect: LongWord): HResult; @@ -698,7 +698,7 @@ end; //---------------------------------------------------------------------------------------------------------------------- -{$IF FPC_FULLVERSION < 020701} +{$IF FPC_FULLVERSION < 020601} function TVTDragManager.QueryContinueDrag(EscapePressed: BOOL; KeyState: Longint): HResult; {$ELSE} function TVTDragManager.QueryContinueDrag(EscapePressed: BOOL; KeyState: LongWord): HResult;