From e037083a5bed03d3147a7f8448b024fa64dd27a2 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sun, 9 Nov 2014 08:34:26 +0000
Subject: Prevent Fl_Copy_Surface.H from including apple system headers on the
 mac platform. With this, no public FLTK header includes system header files
 anymore on the mac.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10443 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 FL/Fl_Copy_Surface.H | 7 ++-----
 FL/mac.H             | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/FL/Fl_Copy_Surface.H b/FL/Fl_Copy_Surface.H
index e26ec47b1..a6ef7220b 100644
--- a/FL/Fl_Copy_Surface.H
+++ b/FL/Fl_Copy_Surface.H
@@ -21,10 +21,7 @@
 
 #include <FL/Fl_Paged_Device.H>
 #include <FL/Fl_Printer.H>
-
-#if defined(__APPLE__)
-#include <ApplicationServices/ApplicationServices.h>
-#endif
+#include <FL/x.H>
 
 /** Supports copying of graphical data to the clipboard.
  
@@ -57,7 +54,7 @@ private:
   int height;
   Fl_Paged_Device *helper;
 #ifdef __APPLE__
-  CFMutableDataRef pdfdata;
+  Fl_CFMutableDataRef pdfdata;
   CGContextRef oldgc;
   CGContextRef gc;
   void prepare_copy_pdf_and_tiff(int w, int h);
diff --git a/FL/mac.H b/FL/mac.H
index c824aa5d0..de8270549 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -41,6 +41,7 @@ typedef struct OpaquePMPrintSettings*   PMPrintSettings;
 typedef struct OpaquePMPageFormat*      PMPageFormat;
 typedef struct OpaquePMPrintSession*    PMPrintSession;
 typedef struct CGImage* CGImageRef;
+typedef void *Fl_CFMutableDataRef; // used in Fl_Copy_Surface.H
 typedef CGContextRef Fl_Offscreen;
 
 #else // this part must be compiled when building the FLTK libraries
@@ -78,6 +79,7 @@ class NSCursor;
 #endif // __OBJC__
 
 typedef CGContextRef Fl_Offscreen;
+typedef CFMutableDataRef Fl_CFMutableDataRef;
 
 typedef struct flCocoaRegion {
   int count;
-- 
cgit v1.2.3