Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-05 08:06:35 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Prevent Fl_Copy_Surface.H from including apple system headers on the mac platform.

Browse Source 
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
This commit is contained in:
Manolo Gouy
2014-11-09 08:34:26 +00:00
parent 574e31276e
commit e037083a5b
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Fl_Copy_Surface.H
+2 -5
View File
@@ -21,10 +21,7 @@
#include <FL/Fl_Paged_Device.H> #include <FL/Fl_Paged_Device.H>
#include <FL/Fl_Printer.H> #include <FL/Fl_Printer.H>
#include <FL/x.H>
#if defined(__APPLE__)
#include <ApplicationServices/ApplicationServices.h>
#endif
/** Supports copying of graphical data to the clipboard. /** Supports copying of graphical data to the clipboard.
@@ -57,7 +54,7 @@ private:
int height; int height;
Fl_Paged_Device *helper; Fl_Paged_Device *helper;
#ifdef __APPLE__ #ifdef __APPLE__
CFMutableDataRef pdfdata; Fl_CFMutableDataRef pdfdata;
CGContextRef oldgc; CGContextRef oldgc;
CGContextRef gc; CGContextRef gc;
void prepare_copy_pdf_and_tiff(int w, int h); void prepare_copy_pdf_and_tiff(int w, int h);
FL/mac.H
+2
View File
@@ -41,6 +41,7 @@ typedef struct OpaquePMPrintSettings* PMPrintSettings;
typedef struct OpaquePMPageFormat* PMPageFormat; typedef struct OpaquePMPageFormat* PMPageFormat;
typedef struct OpaquePMPrintSession* PMPrintSession; typedef struct OpaquePMPrintSession* PMPrintSession;
typedef struct CGImage* CGImageRef; typedef struct CGImage* CGImageRef;
typedef void *Fl_CFMutableDataRef; // used in Fl_Copy_Surface.H
typedef CGContextRef Fl_Offscreen; typedef CGContextRef Fl_Offscreen;
#else // this part must be compiled when building the FLTK libraries #else // this part must be compiled when building the FLTK libraries
@@ -78,6 +79,7 @@ class NSCursor;
#endif // __OBJC__ #endif // __OBJC__
typedef CGContextRef Fl_Offscreen; typedef CGContextRef Fl_Offscreen;
typedef CFMutableDataRef Fl_CFMutableDataRef;
typedef struct flCocoaRegion { typedef struct flCocoaRegion {
int count; int count;