From 12a20ff9faa7b7a7038aa56ac26fda5d88db5ece Mon Sep 17 00:00:00 2001 From: paul Date: Fri, 21 Sep 2012 09:12:22 +0000 Subject: [PATCH] cocoa: fix RestoreDCData git-svn-id: trunk@38778 - --- lcl/interfaces/cocoa/cocoagdiobjects.pas | 4 ++-- lcl/interfaces/cocoa/cocoawinapi.inc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lcl/interfaces/cocoa/cocoagdiobjects.pas b/lcl/interfaces/cocoa/cocoagdiobjects.pas index 3af45e5b27..a20f00add0 100644 --- a/lcl/interfaces/cocoa/cocoagdiobjects.pas +++ b/lcl/interfaces/cocoa/cocoagdiobjects.pas @@ -1271,8 +1271,8 @@ begin FWindowOfs := AData.WindowOfs; FViewportOfs := AData.ViewportOfs; -// isClipped := AData.isClipped; -// FClipRegion.Shape := AData.ClipShape; + FClipped := AData.isClipped; + FClipRegion.Shape := AData.ClipShape; end; constructor TCocoaContext.Create; diff --git a/lcl/interfaces/cocoa/cocoawinapi.inc b/lcl/interfaces/cocoa/cocoawinapi.inc index 61ee08fb38..0a4a8756a0 100644 --- a/lcl/interfaces/cocoa/cocoawinapi.inc +++ b/lcl/interfaces/cocoa/cocoawinapi.inc @@ -1537,7 +1537,7 @@ begin if Assigned(ctx) then begin Result := ctx.BkColor; - ctx.BkColor := Color; + ctx.BkColor := TColor(Color); end else Result := CLR_INVALID;