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

cocoa: Patch from bug #30815

Browse Source 
git-svn-id: trunk@54393 -
This commit is contained in:
sekelsenmat 2017-03-12 21:18:18 +00:00
parent 0a5b1a8a78
commit 54d2c7c435
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/interfaces/cocoa/cocoagdiobjects.pas
View File

@ -343,6 +343,7 @@ type
property Font: TCocoaFont read FFont write SetFont;
property BackgroundColor: TColor read FBackgroundColor write SetBackgoundColor;
property ForegroundColor: TColor read FForegroundColor write SetForegoundColor;
property Layout: NSLayoutManager read FLayout;
end;
{ TCocoaContext }

1
lcl/interfaces/cocoa/cocoaint.pas
View File

@ -161,6 +161,7 @@ type
function RawImage_FromCocoaBitmap(out ARawImage: TRawImage; ABitmap, AMask: TCocoaBitmap; ARect: PRect = nil): Boolean;
function RawImage_DescriptionToBitmapType(ADesc: TRawImageDescription; out bmpType: TCocoaBitmapType): Boolean;
function GetImagePixelData(AImage: CGImageRef; out bitmapByteCount: PtrUInt): Pointer;
class function Create32BitAlphaBitmap(ABitmap, AMask: TCocoaBitmap): TCocoaBitmap;
property NSApp: NSApplication read FNSApp;
property CurrentCursor: HCursor read FCurrentCursor write FCurrentCursor;
property CaptureControl: HWND read FCaptureControl;

6
lcl/interfaces/cocoa/cocoawinapi.inc
View File

@ -534,7 +534,7 @@ begin
Result := HFont(TCocoaFont.Create(LogFont, LongFontName));
end;
function Create32BitAlphaBitmap(ABitmap, AMask: TCocoaBitmap): TCocoaBitmap;
class function TCocoaWidgetSet.Create32BitAlphaBitmap(ABitmap, AMask: TCocoaBitmap): TCocoaBitmap;
var
ARawImage: TRawImage;
Desc: TRawImageDescription absolute ARawimage.Description;
@ -548,7 +548,7 @@ var
begin
Result := nil;
if not RawImage_FromBitmap(ARawImage, HBITMAP(ABitmap), HBITMAP(AMask)) then
if not LCLIntf.RawImage_FromBitmap(ARawImage, HBITMAP(ABitmap), HBITMAP(AMask)) then
Exit;
ImgMaskHandle := 0;
@ -578,7 +578,7 @@ begin
end;
try
if not RawImage_CreateBitmaps(ImagePtr^, ImgHandle, ImgMaskHandle, True) then Exit;
if not LCLIntf.RawImage_CreateBitmaps(ImagePtr^, ImgHandle, ImgMaskHandle, True) then Exit;
Result := TCocoaBitmap(ImgHandle);
finally