Clean mac.H of a few useless #include directives.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11468 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2016-03-29 19:52:51 +00:00
parent fd600aa239
commit 08677d0cb6
2 changed files with 3 additions and 6 deletions

View File

@ -33,10 +33,9 @@ typedef class FLWindow *Window; // pointer to the FLWindow objective-c class
#endif // __OBJC__
#include <FL/Fl_Device.H>
#include "src/drivers/Darwin/Fl_Darwin_System_Driver.H"
#include <FL/Fl_System_Driver.H>
#if !(defined(FL_LIBRARY) || defined(FL_INTERNALS)) // this part is used when compiling an application program
# include <FL/Fl_Widget.H>
typedef struct CGContext* CGContextRef;
typedef struct OpaquePMPrintSettings* PMPrintSettings;
@ -107,12 +106,9 @@ struct flCocoaRegion {
CGRect *rects;
}; // a region is the union of a series of rectangles
# include "Fl_Window.H"
# include <FL/Fl_Window.H>
# include "../src/Fl_Font.H"
// Some random X equivalents
struct XPoint { int x, y; };
struct XRectangle {int x, y, width, height;};
#ifndef CGFLOAT_DEFINED //appears with 10.5 in CGBase.h
#if defined(__LP64__) && __LP64__
typedef double CGFloat;

View File

@ -45,6 +45,7 @@ class Fl_Window;
class FL_EXPORT Fl_Cocoa_Screen_Driver : public Fl_Screen_Driver
{
protected:
struct XRectangle {int x, y, width, height;};
XRectangle screens[MAX_SCREENS];
float dpi_h[MAX_SCREENS];
float dpi_v[MAX_SCREENS];