From 412cb29f9aeb216ee2575fb55c288e760ff334b3 Mon Sep 17 00:00:00 2001 From: skalogryz Date: Tue, 29 Jan 2019 19:04:54 +0000 Subject: [PATCH] richmemo: fix win32 compilation for trunk. #34970 git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6810 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/richmemo/win32/win32richmemoole.pas | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/components/richmemo/win32/win32richmemoole.pas b/components/richmemo/win32/win32richmemoole.pas index d28b4b480..4edbaf4f8 100644 --- a/components/richmemo/win32/win32richmemoole.pas +++ b/components/richmemo/win32/win32richmemoole.pas @@ -20,9 +20,16 @@ unit Win32RichMemoOle; interface +{$if FPC_FULLVERSION < 30200} +{$undef MEDVAR} +{$else} +{$define MEDVAR} +{$endif} + uses Windows, ActiveX, ComObj, Win32RichMemoProc; + {.$define oledebug} type @@ -62,7 +69,9 @@ type Function GetDataHere(CONST pformatetc : FormatETC; Out medium : STGMEDIUM):HRESULT; STDCALL; Function QueryGetData(const pformatetc : FORMATETC):HRESULT; STDCALL; Function GetCanonicalFormatEtc(const pformatetcIn : FORMATETC;Out pformatetcOut : FORMATETC):HResult; STDCALl; - Function SetData (Const pformatetc : FORMATETC;const medium:STGMEDIUM;FRelease : BOOL):HRESULT; StdCall; + Function SetData (Const pformatetc : FORMATETC; + {$ifdef MEDVAR}var{$ELSE}const{$ENDIF} medium:STGMEDIUM; + FRelease : BOOL):HRESULT; StdCall; Function EnumFormatEtc(dwDirection : DWord; OUT enumformatetcpara : IENUMFORMATETC):HRESULT; StdCall; Function DAdvise(const formatetc : FORMATETC;advf :DWORD; CONST AdvSink : IAdviseSink;OUT dwConnection:DWORD):HRESULT;StdCall; Function DUnadvise(dwconnection :DWord) :HRESULT;StdCall; @@ -261,7 +270,8 @@ begin end; function TCustomDataObject.SetData(const pformatetc: FORMATETC; - const medium: STGMEDIUM; FRelease: BOOL): HRESULT; StdCall; + {$ifdef MEDVAR}var{$ELSE}const{$ENDIF} medium: STGMEDIUM; + FRelease: BOOL): HRESULT; StdCall; begin {$ifdef oledebug}writeln('IDataObject.SetData');{$endif} Result:=S_OK;