paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 23:39:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

carbon: fix compilation due to GetStockObject result type changes

Browse Source 
git-svn-id: trunk@26600 -
This commit is contained in:
dmitry 2010-07-11 16:10:58 +00:00
parent 33081ba014
commit 59f9b13b95
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/carbon/carbonedits.pp
View File

@ -1897,7 +1897,7 @@ end;
function TCarbonMemo.GetLine(AIndex: Integer): String; function TCarbonMemo.GetLine(AIndex: Integer): String;
var var
AStart, AEnd: TXNOffset; AStart, AEnd: TXNOffset;
Data: Handle; Data: MacOSAll.Handle;
W: WideString; W: WideString;
begin begin
Result := ''; Result := '';

6
lcl/interfaces/carbon/carbonlistviews.pp
View File

@ -307,7 +307,7 @@ var
ColSpace : CGColorSpaceRef; ColSpace : CGColorSpaceRef;
data : array of byte; data : array of byte;
iconHnd : IconFamilyHandle; iconHnd : IconFamilyHandle;
tmpHnd : Handle; tmpHnd : MacOSAll.Handle;
i,c,sz : Integer; i,c,sz : Integer;
dataType : Integer; dataType : Integer;
maskType : Integer; maskType : Integer;
@ -385,9 +385,9 @@ begin
end; end;
OSError( OSError(
GetIconRefFromIconFamilyPtr( iconHnd^^, GetHandleSize(Handle(iconHnd)), Result), GetIconRefFromIconFamilyPtr( iconHnd^^, GetHandleSize(MacOSAll.Handle(iconHnd)), Result),
'GetIconRefFromBitmap', 'GetIconRefFromIconFamilyPtr'); 'GetIconRefFromBitmap', 'GetIconRefFromIconFamilyPtr');
DisposeHandle(Handle(iconHnd)); DisposeHandle(MacOSAll.Handle(iconHnd));
end; end;
function GetIconRefFromImageList(Images: TCustomImageList; AIndex: Integer; WantedIconSize: Integer): IconRef; function GetIconRefFromImageList(Images: TCustomImageList; AIndex: Integer; WantedIconSize: Integer): IconRef;

2
lcl/interfaces/carbon/carbonwinapi.inc
View File

@ -1878,7 +1878,7 @@ end;
Retrieves a handle to one of the predefined stock objects Retrieves a handle to one of the predefined stock objects
------------------------------------------------------------------------------} ------------------------------------------------------------------------------}
function TCarbonWidgetSet.GetStockObject(Value: Integer): LongInt; function TCarbonWidgetSet.GetStockObject(Value: Integer): THandle;
begin begin
Result := 0; Result := 0;

2
lcl/interfaces/carbon/carbonwinapih.inc
View File

@ -124,7 +124,7 @@ function GetRgnBox(RGN : HRGN; lpRect : PRect) : Longint; override;
function GetScrollBarSize(Handle: HWND; BarKind: Integer): integer; override; function GetScrollBarSize(Handle: HWND; BarKind: Integer): integer; override;
function GetScrollbarVisible(Handle: HWND; SBStyle: Integer): boolean; override; function GetScrollbarVisible(Handle: HWND; SBStyle: Integer): boolean; override;
function GetScrollInfo(Handle: HWND; SBStyle: Integer; var ScrollInfo: TScrollInfo): Boolean; override; function GetScrollInfo(Handle: HWND; SBStyle: Integer; var ScrollInfo: TScrollInfo): Boolean; override;
function GetStockObject(Value: Integer): LongInt; override; function GetStockObject(Value: Integer): THandle; override;
function GetSysColor(NIndex: Integer): DWORD; override; function GetSysColor(NIndex: Integer): DWORD; override;
function GetSystemMetrics(NIndex: Integer): Integer; override; function GetSystemMetrics(NIndex: Integer): Integer; override;
function GetTextColor(DC: HDC) : TColorRef; Override; function GetTextColor(DC: HDC) : TColorRef; Override;