Skip to content

Commit ed5877e

Browse files
blikblumblikblum
committed
Fix compilation with recent Lazarus / fpc
1 parent e6f6031 commit ed5877e

11 files changed

+65
-27
lines changed

‎Source/VTHeaderPopup.pas‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -191,11 +191,7 @@ procedure TVTHeaderPopupMenu.Popup(x, y: Integer);
191191
if poResizeToFitItem in Self.Options then begin
192192
NewMenuItem := NewItem(sResizeToFit, 0, False, True, OnMenuItemClick, 0, cResizeToFitMenuItemName);
193193
Items.Add(NewMenuItem);
194-
{$IF LCL_FullVersion >= 2000000}
195-
Items.Add(NewLineMI());
196-
{$ELSE}
197194
Items.Add(NewLine());
198-
{$IFEND}
199195
end;//poResizeToFitItem
200196

201197
// Add column menu items.

‎Source/VirtualTrees.pas‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,9 @@ TVTDataObject = class(TInterfacedObject, IDataObject)
815815
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
816816
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
817817
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
818-
function SetData(const FormatEtc: TFormatEtc; const Medium: TStgMedium; DoRelease: BOOL): HResult; virtual; stdcall;
818+
function SetData(const FormatEtc: TFormatEtc;
819+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
820+
DoRelease: BOOL): HResult; virtual; stdcall;
819821
end;
820822

821823
// TVTDragManager is a class to manage drag and drop in a Virtual Treeview.

‎Source/include/intf/dummydragmanager.inc‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
1+
{$warnings off}
2+
{$hints off}
23

34
//----------------------------------------------------------------------------------------------------------------------
45

@@ -532,7 +533,9 @@ end;
532533

533534
//----------------------------------------------------------------------------------------------------------------------
534535

535-
function TVTDataObject.SetData(const FormatEtc: TFormatEtc; {$ifdef VER2_0}var{$else}const{$endif} Medium: TStgMedium; DoRelease: BOOL): HResult;
536+
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
537+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
538+
DoRelease: BOOL): HResult;
536539

537540
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement
538541
// IDropSourceHelper and allows to set a special format for optimized moves during a shell transfer.

‎Source/include/intf/win32/vtvdragmanager.inc‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ begin
5454
CopyCount := celt;
5555
if CopyCount > 0 then
5656
begin
57-
Move(FFormatEtcArray[FCurrentIndex], elt, CopyCount * SizeOf(TFormatEtc));
57+
Move(FFormatEtcArray[FCurrentIndex], {%H-}elt, CopyCount * SizeOf(TFormatEtc));
5858
Inc(FCurrentIndex, CopyCount);
5959
Result := S_OK;
6060
end;
@@ -481,7 +481,9 @@ end;
481481

482482
//----------------------------------------------------------------------------------------------------------------------
483483

484-
function TVTDataObject.SetData(const FormatEtc: TFormatEtc; const Medium: TStgMedium; DoRelease: BOOL): HResult;
484+
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
485+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
486+
DoRelease: BOOL): HResult;
485487

486488
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement
487489
// IDropSourceHelper and allows to set a special format for optimized moves during a shell transfer.

‎Source/units/carbon/virtualdragmanager.pas‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@ ULARGE_INTEGER = record
272272
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
273273
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
274274
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
275-
Function SetData (Const pformatetc : FORMATETC;const medium:STGMEDIUM;FRelease : BOOL):HRESULT; StdCall;
275+
Function SetData (Const pformatetc : FORMATETC;
276+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
277+
FRelease : BOOL):HRESULT; StdCall;
276278
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
277279
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
278280
Function DUnadvise(dwconnection :DWord) :HRESULT;StdCall;
@@ -405,7 +407,9 @@ TVTDataObject = class(TInterfacedObject, IDataObject)
405407
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
406408
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
407409
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
408-
function SetData(const FormatEtc: TFormatEtc;{$ifdef VER2_0}var{$else}const{$endif} Medium: TStgMedium; DoRelease: BOOL): HResult; virtual; stdcall;
410+
function SetData(const FormatEtc: TFormatEtc;
411+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
412+
DoRelease: BOOL): HResult; virtual; stdcall;
409413
end;
410414

411415
// TVTDragManager is a class to manage drag and drop in a Virtual Treeview.
@@ -1335,7 +1339,9 @@ function TVTDataObject.QueryGetData(const FormatEtc: TFormatEtc): HResult;
13351339

13361340
//----------------------------------------------------------------------------------------------------------------------
13371341

1338-
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;{$ifdef VER2_0}var{$else}const{$endif} Medium: TStgMedium; DoRelease: BOOL): HResult;
1342+
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
1343+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
1344+
DoRelease: BOOL): HResult;
13391345

13401346
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement
13411347
// IDropSourceHelper and allows to set a special format for optimized moves during a shell transfer.

‎Source/units/cocoa/virtualdragmanager.pas‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@ ULARGE_INTEGER = record
272272
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
273273
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
274274
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
275-
Function SetData (Const pformatetc : FORMATETC;const medium:STGMEDIUM;FRelease : BOOL):HRESULT; StdCall;
275+
Function SetData (Const pformatetc : FORMATETC;
276+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
277+
FRelease : BOOL):HRESULT; StdCall;
276278
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
277279
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
278280
Function DUnadvise(dwconnection :DWord) :HRESULT;StdCall;
@@ -405,7 +407,9 @@ TVTDataObject = class(TInterfacedObject, IDataObject)
405407
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
406408
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
407409
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
408-
function SetData(const FormatEtc: TFormatEtc;{$ifdef VER2_0}var{$else}const{$endif} Medium: TStgMedium; DoRelease: BOOL): HResult; virtual; stdcall;
410+
function SetData(const FormatEtc: TFormatEtc;
411+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
412+
DoRelease: BOOL): HResult; virtual; stdcall;
409413
end;
410414

411415
// TVTDragManager is a class to manage drag and drop in a Virtual Treeview.

‎Source/units/dummyactivex.inc‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
1+
{$warnings off}
2+
{$hints off}
23

34
{fake unit just to compile - not used under non windows}
45

@@ -262,7 +263,9 @@ type
262263
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
263264
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
264265
Function GetCanonicalFormatEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
265-
Function SetData (Const pformatetc : FORMATETC;const medium:STGMEDIUM;FRelease : BOOL):HRESULT; StdCall;
266+
Function SetData (Const pformatetc : FORMATETC;
267+
{$IF FPC_FullVersion >= 30200}var{$else}const{$IFEND} medium:STGMEDIUM;
268+
FRelease : BOOL):HRESULT; StdCall;
266269
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
267270
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
268271
Function DUnadvise(dwconnection :DWord) :HRESULT;StdCall;

‎Source/units/gtk/virtualdragmanager.pas‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@ ULARGE_INTEGER = record
272272
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
273273
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
274274
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
275-
Function SetData (Const pformatetc : FORMATETC;const medium:STGMEDIUM;FRelease : BOOL):HRESULT; StdCall;
275+
Function SetData (Const pformatetc : FORMATETC;
276+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
277+
FRelease : BOOL):HRESULT; StdCall;
276278
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
277279
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
278280
Function DUnadvise(dwconnection :DWord) :HRESULT;StdCall;
@@ -405,7 +407,9 @@ TVTDataObject = class(TInterfacedObject, IDataObject)
405407
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
406408
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
407409
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
408-
function SetData(const FormatEtc: TFormatEtc;{$ifdef VER2_0}var{$else}const{$endif} Medium: TStgMedium; DoRelease: BOOL): HResult; virtual; stdcall;
410+
function SetData(const FormatEtc: TFormatEtc;
411+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
412+
DoRelease: BOOL): HResult; virtual; stdcall;
409413
end;
410414

411415
// TVTDragManager is a class to manage drag and drop in a Virtual Treeview.
@@ -1335,7 +1339,9 @@ function TVTDataObject.QueryGetData(const FormatEtc: TFormatEtc): HResult;
13351339

13361340
//----------------------------------------------------------------------------------------------------------------------
13371341

1338-
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;{$ifdef VER2_0}var{$else}const{$endif} Medium: TStgMedium; DoRelease: BOOL): HResult;
1342+
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
1343+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
1344+
DoRelease: BOOL): HResult;
13391345

13401346
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement
13411347
// IDropSourceHelper and allows to set a special format for optimized moves during a shell transfer.

‎Source/units/gtk2/virtualdragmanager.pas‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@ ULARGE_INTEGER = record
272272
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
273273
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
274274
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
275-
Function SetData (Const pformatetc : FORMATETC;const medium:STGMEDIUM;FRelease : BOOL):HRESULT; StdCall;
275+
Function SetData (Const pformatetc : FORMATETC;
276+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
277+
FRelease : BOOL):HRESULT; StdCall;
276278
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
277279
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
278280
Function DUnadvise(dwconnection :DWord) :HRESULT;StdCall;
@@ -405,7 +407,9 @@ TVTDataObject = class(TInterfacedObject, IDataObject)
405407
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
406408
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
407409
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
408-
function SetData(const FormatEtc: TFormatEtc;{$ifdef VER2_0}var{$else}const{$endif} Medium: TStgMedium; DoRelease: BOOL): HResult; virtual; stdcall;
410+
function SetData(const FormatEtc: TFormatEtc;
411+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
412+
DoRelease: BOOL): HResult; virtual; stdcall;
409413
end;
410414

411415
// TVTDragManager is a class to manage drag and drop in a Virtual Treeview.
@@ -1335,7 +1339,9 @@ function TVTDataObject.QueryGetData(const FormatEtc: TFormatEtc): HResult;
13351339

13361340
//----------------------------------------------------------------------------------------------------------------------
13371341

1338-
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;{$ifdef VER2_0}var{$else}const{$endif} Medium: TStgMedium; DoRelease: BOOL): HResult;
1342+
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
1343+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
1344+
DoRelease: BOOL): HResult;
13391345

13401346
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement
13411347
// IDropSourceHelper and allows to set a special format for optimized moves during a shell transfer.

‎Source/units/qt/virtualdragmanager.pas‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,9 @@ ULARGE_INTEGER = record
272272
Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL;
273273
Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL;
274274
Function GetCanonicalFormatTEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl;
275-
Function SetData (Const pformatetc : FORMATETC;const medium:STGMEDIUM;FRelease : BOOL):HRESULT; StdCall;
275+
Function SetData (Const pformatetc : FORMATETC;
276+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} medium:STGMEDIUM;
277+
FRelease : BOOL):HRESULT; StdCall;
276278
Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall;
277279
Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall;
278280
Function DUnadvise(dwconnection :DWord) :HRESULT;StdCall;
@@ -405,7 +407,9 @@ TVTDataObject = class(TInterfacedObject, IDataObject)
405407
function GetData(const FormatEtcIn: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
406408
function GetDataHere(const FormatEtc: TFormatEtc; out Medium: TStgMedium): HResult; virtual; stdcall;
407409
function QueryGetData(const FormatEtc: TFormatEtc): HResult; virtual; stdcall;
408-
function SetData(const FormatEtc: TFormatEtc;{$ifdef VER2_0}var{$else}const{$endif} Medium: TStgMedium; DoRelease: BOOL): HResult; virtual; stdcall;
410+
function SetData(const FormatEtc: TFormatEtc;
411+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
412+
DoRelease: BOOL): HResult; virtual; stdcall;
409413
end;
410414

411415
// TVTDragManager is a class to manage drag and drop in a Virtual Treeview.
@@ -1335,7 +1339,9 @@ function TVTDataObject.QueryGetData(const FormatEtc: TFormatEtc): HResult;
13351339

13361340
//----------------------------------------------------------------------------------------------------------------------
13371341

1338-
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;{$ifdef VER2_0}var{$else}const{$endif} Medium: TStgMedium; DoRelease: BOOL): HResult;
1342+
function TVTDataObject.SetData(const FormatEtc: TFormatEtc;
1343+
{$IF FPC_FullVersion >= 30200}var{$ELSE}const{$IFEND} Medium: TStgMedium;
1344+
DoRelease: BOOL): HResult;
13391345

13401346
// Allows dynamic adding to the IDataObject during its existance. Most noteably it is used to implement
13411347
// IDropSourceHelper and allows to set a special format for optimized moves during a shell transfer.

0 commit comments

Comments
 (0)