From 40254e8891fe3258ac8be2c835decafb2909eb2f Mon Sep 17 00:00:00 2001
From: dmitry <dmitry@lazarus-ide.org>
Date: Tue, 11 Jan 2011 05:49:49 +0000
Subject: [PATCH] cocoa: fix compilation for the latest fpc rev 16747
 #c48ce44f60

git-svn-id: trunk@28947 -
---
 lcl/interfaces/cocoa/cocoaprivate.pp | 3 ++-
 lcl/interfaces/cocoa/cocoautils.pas  | 8 --------
 lcl/interfaces/cocoa/cocoawinapi.inc | 7 -------
 3 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/lcl/interfaces/cocoa/cocoaprivate.pp b/lcl/interfaces/cocoa/cocoaprivate.pp
index c98cbe25cc..537bef4a50 100644
--- a/lcl/interfaces/cocoa/cocoaprivate.pp
+++ b/lcl/interfaces/cocoa/cocoaprivate.pp
@@ -28,6 +28,7 @@ interface
 uses
   // rtl+ftl
   Types, Classes, SysUtils,
+  CGGeometry,
   // Libs
   MacOSAll, CocoaAll, CocoaUtils;
 
@@ -627,7 +628,7 @@ end;
 function LCLWindowExtension.lclClientFrame:TRect;
 var
   wr  : NSRect;
-  b   : NSRect;
+  b   : CGGeometry.CGRect;
 begin
   wr:=frame;
   b:=contentView.frame;
diff --git a/lcl/interfaces/cocoa/cocoautils.pas b/lcl/interfaces/cocoa/cocoautils.pas
index 557eafb8a5..f6143357a1 100644
--- a/lcl/interfaces/cocoa/cocoautils.pas
+++ b/lcl/interfaces/cocoa/cocoautils.pas
@@ -10,14 +10,6 @@ uses
   Types, LCLType;
 
 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 = objccategory(NSObject)
diff --git a/lcl/interfaces/cocoa/cocoawinapi.inc b/lcl/interfaces/cocoa/cocoawinapi.inc
index ee74bbe3d3..f82fcf0234 100644
--- a/lcl/interfaces/cocoa/cocoawinapi.inc
+++ b/lcl/interfaces/cocoa/cocoawinapi.inc
@@ -411,13 +411,6 @@ begin
   CritSection:=0;
 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);
 begin
   if CritSection=0 then Exit;