* replaced dependency on MacOSAll with individual units (based on

    information provided by Scott Knapp)
  - removed CFErrorRef declaration from UndefinedTypes since the CFError
    headers are available in the current univint translations


git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15468 3ad0048d-3df7-0310-abae-a5850022a9f2

3 files changed, 9 insertions, 6 deletions

diff --git a/packages/cocoaint/src/CocoaAll.pas b/packages/cocoaint/src/CocoaAll.pas
index 8523851d1c..100983cd31 100644
--- a/packages/cocoaint/src/CocoaAll.pas
+++ b/packages/cocoaint/src/CocoaAll.pas
@@ -6,7 +6,11 @@ unit CocoaAll;
 interface
 
 uses 
-  ctypes, MacOSAll;
+  ctypes,
+  AEDataModel,IconsCore,
+  CFBase, CFArray, CFBag , CFCharacterSet, CFData, CFDate, CFDictionary, CFNumber ,CFPropertyList, CFSet, CFString, CFStringEncodingExt, CFTimeZone, CFTree, CFURL, CFXMLNode, CFXMLParser, CFMachPort, CFMessagePort, CFRunLoop, CFSocket, CFBinaryHeap, CFBitVector, CFBundle, CFByteOrders, CFPlugIn, CFPreferences, CFURLAccess, CFUUID, CFLocale, CFStream, CFDateFormatter, CFNumberFormatter, CFCalendar, CFUserNotification, CFNotificationCenter, CFAttributedString,
+  CGBase, CGAffineTransforms, CGBitmapContext, CGColor, CGColorSpace, CGContext, CGDataConsumer, CGDataProvider, CGDirectDisplay, CGDirectPalette, CGDisplayConfiguration, CGDisplayFades, CGErrors, CGEvent, CGEventSource, CGEventTypes, CGFont, CGFunction, CGGLContext, CGGeometry, CGImage, CGLayer, CGPDFArray, CGPDFContentStream, CGPDFContext, CGPDFDictionary, CGPDFDocument, CGPDFObject, CGPDFOperatorTable, CGPDFPage, CGPDFScanner, CGPDFStream, CGPDFString, CGPSConverter, CGPath, CGPattern, CGRemoteOperation, CGSession, CGShading, CGWindowLevels,
+  MacTypes;
   
 {$linkframework Cocoa}
 {$define INTERFACE}
diff --git a/packages/cocoaint/src/UndefinedTypes.inc b/packages/cocoaint/src/UndefinedTypes.inc
index 03bea6a613..ce62f9976b 100644
--- a/packages/cocoaint/src/UndefinedTypes.inc
+++ b/packages/cocoaint/src/UndefinedTypes.inc
@@ -70,10 +70,6 @@ const
  NX_TABLET_BUTTON_PENLOWERSIDEMASK = $0002;
  NX_TABLET_BUTTON_PENUPPERSIDEMASK = $0004;
   
-{ The CFError API is not in MacOSAll! we need to port this for PasCocoa... } 
-type
-  CFErrorRef = Pointer;
- 
 { Parser hacks - these types should never exist }
 type
   char_ = Pointer;
diff --git a/packages/cocoaint/src/WebKit.pas b/packages/cocoaint/src/WebKit.pas
index eb06c4ed60..3d2959e4b9 100644
--- a/packages/cocoaint/src/WebKit.pas
+++ b/packages/cocoaint/src/WebKit.pas
@@ -8,7 +8,10 @@ interface
 {$linkframework WebKit}
 
 uses
-  ctypes, CocoaAll, MacOSAll;
+  ctypes, CocoaAll,
+  CFBase, CFArray, CFBag , CFCharacterSet, CFData, CFDate, CFDictionary, CFNumber ,CFPropertyList, CFSet, CFString, CFStringEncodingExt, CFTimeZone, CFTree, CFURL, CFXMLNode, CFXMLParser, CFMachPort, CFMessagePort, CFRunLoop, CFSocket, CFBinaryHeap, CFBitVector, CFBundle, CFByteOrders, CFPlugIn, CFPreferences, CFURLAccess, CFUUID, CFLocale, CFStream, CFDateFormatter, CFNumberFormatter, CFCalendar, CFUserNotification, CFNotificationCenter, CFAttributedString,
+  CGBase, CGAffineTransforms, CGBitmapContext, CGColor, CGColorSpace, CGContext, CGDataConsumer, CGDataProvider, CGDirectDisplay, CGDirectPalette, CGDisplayConfiguration, CGDisplayFades, CGErrors, CGEvent, CGEventSource, CGEventTypes, CGFont, CGFunction, CGGLContext, CGGeometry, CGImage, CGLayer, CGPDFArray, CGPDFContentStream, CGPDFContext, CGPDFDictionary, CGPDFDocument, CGPDFObject, CGPDFOperatorTable, CGPDFPage, CGPDFScanner, CGPDFStream, CGPDFString, CGPSConverter, CGPath, CGPattern, CGRemoteOperation, CGSession, CGShading, CGWindowLevels,
+  MacTypes;
   
 {$define INTERFACE}