mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-06-19 06:48:26 +02:00
cocoa: fix compilation for the latest fpc rev 16747 #c48ce44f60
git-svn-id: trunk@28947 -
This commit is contained in:
parent
54f3912158
commit
40254e8891
@ -28,6 +28,7 @@ interface
|
|||||||
uses
|
uses
|
||||||
// rtl+ftl
|
// rtl+ftl
|
||||||
Types, Classes, SysUtils,
|
Types, Classes, SysUtils,
|
||||||
|
CGGeometry,
|
||||||
// Libs
|
// Libs
|
||||||
MacOSAll, CocoaAll, CocoaUtils;
|
MacOSAll, CocoaAll, CocoaUtils;
|
||||||
|
|
||||||
@ -627,7 +628,7 @@ end;
|
|||||||
function LCLWindowExtension.lclClientFrame:TRect;
|
function LCLWindowExtension.lclClientFrame:TRect;
|
||||||
var
|
var
|
||||||
wr : NSRect;
|
wr : NSRect;
|
||||||
b : NSRect;
|
b : CGGeometry.CGRect;
|
||||||
begin
|
begin
|
||||||
wr:=frame;
|
wr:=frame;
|
||||||
b:=contentView.frame;
|
b:=contentView.frame;
|
||||||
|
@ -10,14 +10,6 @@ uses
|
|||||||
Types, LCLType;
|
Types, LCLType;
|
||||||
|
|
||||||
type
|
type
|
||||||
{ NSObjectExtensionExternal }
|
|
||||||
|
|
||||||
NSObjectExtensionExternal = objccategory(NSObject)
|
|
||||||
//the method is available at NSObject, but not declared in NSObject,
|
|
||||||
// for some reason
|
|
||||||
function className: NSString; message 'className';
|
|
||||||
end; external;
|
|
||||||
|
|
||||||
{ NSLCLDebugExtension }
|
{ NSLCLDebugExtension }
|
||||||
|
|
||||||
NSLCLDebugExtension = objccategory(NSObject)
|
NSLCLDebugExtension = objccategory(NSObject)
|
||||||
|
@ -411,13 +411,6 @@ begin
|
|||||||
CritSection:=0;
|
CritSection:=0;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
type
|
|
||||||
//workaround for CocoaInt bug
|
|
||||||
NSLockExtension = objccategory(NSRecursiveLock)
|
|
||||||
procedure lock; message 'lock';
|
|
||||||
procedure unlock; message 'unlock';
|
|
||||||
end; external;
|
|
||||||
|
|
||||||
procedure TCocoaWidgetSet.EnterCriticalSection(var CritSection: TCriticalSection);
|
procedure TCocoaWidgetSet.EnterCriticalSection(var CritSection: TCriticalSection);
|
||||||
begin
|
begin
|
||||||
if CritSection=0 then Exit;
|
if CritSection=0 then Exit;
|
||||||
|
Loading…
Reference in New Issue
Block a user