diff options
| author | Manolo Gouy <Manolo> | 2016-03-29 19:52:51 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-29 19:52:51 +0000 |
| commit | 08677d0cb6a9d7e799e315fd3a6f8ed919ce4d90 (patch) | |
| tree | ba84de1ee05f0f64863d3c5557050fadbe5c12ed | |
| parent | fd600aa2396cc7fa0d4cd020cd318fbe6ef6e9b4 (diff) | |
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
| -rw-r--r-- | FL/mac.H | 8 | ||||
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H | 1 |
2 files changed, 3 insertions, 6 deletions
@@ -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; diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H index 75b64fe6b..f9713f1aa 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H @@ -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]; |