paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-05-16 16:43:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

qt interface: fixed compilation with fpc 2.5.1 after the changes in IUnknown

Browse Source 
git-svn-id: trunk@27753 -
This commit is contained in:
vincents 2010-10-18 20:54:00 +00:00
parent 3c1071b4f1
commit 55f95c92d2
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lcl/interfaces/qt/qtwidgets.pas
View File

@ -135,10 +135,15 @@ type
function ShiftStateToQtModifiers(Shift: TShiftState): QtModifier;
protected
// IUnknown implementation
{$IFDEF FPC_HAS_CONSTREF}
function QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
function _AddRef: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
function _Release: LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
{$ELSE}
function QueryInterface(const iid : tguid;out obj) : longint;stdcall;
function _AddRef : longint;stdcall;
function _Release : longint;stdcall;
{$ENDIF}
function GetContext: HDC; virtual;
function CreateWidget(const Params: TCreateParams):QWidgetH; virtual;
procedure DestroyWidget; virtual;
@ -4228,7 +4233,11 @@ begin
if ssAlt in Shift then Inc(Result, QtALT);
end;
{$IFDEF FPC_HAS_CONSTREF}
function TQtWidget.QueryInterface(constref iid: TGuid; out obj): LongInt; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
{$ELSE}
function TQtWidget.QueryInterface(const iid: tguid; out obj): longint; stdcall;
{$ENDIF}
begin
if GetInterface(iid, obj) then
Result := 0
@ -4236,12 +4245,20 @@ begin
Result := E_NOINTERFACE;
end;
{$IFDEF FPC_HAS_CONSTREF}
function TQtWidget._AddRef: longint; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
{$ELSE}
function TQtWidget._AddRef: longint; stdcall;
{$ENDIF}
begin
Result := -1; // no ref counting
end;
{$IFDEF FPC_HAS_CONSTREF}
function TQtWidget._Release: longint; stdcall; {$IFDEF WINDOWS}stdcall{$ELSE}cdecl{$ENDIF};
{$ELSE}
function TQtWidget._Release: longint; stdcall;
{$ENDIF}
begin
Result := -1;
end;