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 #include - -#if defined(__APPLE__) -#include -#endif +#include /** 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;