1) Added a new way to detect whether the drawing operation is using the platform's native driver

and whether we are printing:  virtual int Fl_Graphics_Driver::has_feature(driver_feature feature)
This is also because it is not convenient to derive a printer-specific driver with its own
implementation of virtual functions when this implementation differs only in one line of code.

2) Solved the problem of inclusion of non public header by the public header FL/Fl_Device.H:
bracket this with #if FL_LIBRARY / #endif so this non public header is included only when building
FLTK itself.

3) Removed several (but not all) of the FLTK_ABI_VERSION guards that are no longer
useful for code targeting FLTK 1.4.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11063 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 0 insertions, 16 deletions

diff --git a/FL/mac.H b/FL/mac.H
index 31ff624fd..586ae918c 100644
--- a/FL/mac.H
+++ b/FL/mac.H
@@ -144,14 +144,7 @@ public:
   Fl_Offscreen other_xid;  // pointer for offscreen bitmaps (overlay window)
   Fl_Window *w;            // FLTK window for 
   Fl_Region region;
-#if FLTK_ABI_VERSION < 10304
-  Fl_Region subRegion;     // for ABI compatibility, recycled to replace subRect_
-#endif
   Fl_X *next;              // chain of mapped windows
-#if FLTK_ABI_VERSION < 10304
-  Fl_X *xidChildren;       // useless with true subwindows, recycled to replace mapped_to_retina_
-  Fl_X *xidNext;           // useless with true subwindows
-#endif
   int wait_for_expose;
   NSCursor *cursor;
   static Fl_X* first;
@@ -160,13 +153,8 @@ public:
   static void make(Fl_Window*);
   void flush();
   static void set_high_resolution(bool);
-#if FLTK_ABI_VERSION >= 10304
   CGRect* subRect() { return subRect_; } // getter
   void subRect(CGRect *r) { subRect_ = r; } // setter
-#else
-  CGRect* subRect() { return (CGRect*)subRegion; } // getter
-  void subRect(CGRect *r) { subRegion = (Fl_Region)r; } // setter
-#endif
   bool mapped_to_retina();      // is window mapped to retina display?
   void mapped_to_retina(bool);  // sets whether window is mapped to retina display
   bool changed_resolution();      // did window just moved to display with another resolution?
@@ -213,14 +201,10 @@ public:
   static int calc_mac_os_version(void); // computes the fl_mac_os_version global variable
   static void clip_to_rounded_corners(CGContextRef gc, int w, int h);
 private:
-#if FLTK_ABI_VERSION >= 10304
   CGRect* subRect_;           // makes sure subwindow remains inside its parent window
   // stores 3 binary flags: whether window is mapped to retina display; whether resolution just changed;
   // whether window is OpenGL and is currently being resized.
   unsigned mapped_to_retina_;
-#else
-  bool subwindow;     // for ABI compatibility, useless with true subwindows
-#endif
 };
 
 extern Window fl_window;