From 8e3f66073f8e30e874eb3e6cf76ab0a614c39aad Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Wed, 27 Jan 2016 18:11:20 +0000 Subject: 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 --- FL/Fl_Shared_Image.H | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'FL/Fl_Shared_Image.H') diff --git a/FL/Fl_Shared_Image.H b/FL/Fl_Shared_Image.H index 09bd636b2..2bc490688 100644 --- a/FL/Fl_Shared_Image.H +++ b/FL/Fl_Shared_Image.H @@ -44,9 +44,7 @@ class FL_EXPORT Fl_Shared_Image : public Fl_Image { private: static Fl_RGB_Scaling scaling_algorithm_; // method used to rescale RGB source images -#if FLTK_ABI_VERSION >= 10304 Fl_Image *scaled_image_; -#endif protected: static Fl_Shared_Image **images_; // Shared images @@ -101,7 +99,7 @@ public: and then drawing the resized copy. This occurs, e.g., when drawing to screen under Linux or MSWindows after having called Fl_Shared_Image::scale(). This function controls what method is used when the image to be resized is an Fl_RGB_Image. - \version 1.3.4 and requires compiling with FLTK_ABI_VERSION = 10304 + \version 1.3.4 and requires compiling with FL_ABI_VERSION = 10304 */ static void scaling_algorithm(Fl_RGB_Scaling algorithm) {scaling_algorithm_ = algorithm; } }; -- cgit v1.2.3