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_Window.H | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'FL/Fl_Window.H') diff --git a/FL/Fl_Window.H b/FL/Fl_Window.H index 0a69a4c13..a8f2515e8 100644 --- a/FL/Fl_Window.H +++ b/FL/Fl_Window.H @@ -60,37 +60,13 @@ class FL_EXPORT Fl_Window : public Fl_Group { // Note: we must use separate statements for each of the following 8 variables, // with the static attribute, otherwise MS VC++ 2008/2010 complains :-( // AlbrechtS 04/2012 -#if FLTK_ABI_VERSION < 10301 - static // when these members are static, ABI compatibility with 1.3.0 is respected -#endif int no_fullscreen_x; -#if FLTK_ABI_VERSION < 10301 - static // when these members are static, ABI compatibility with 1.3.0 is respected -#endif int no_fullscreen_y; -#if FLTK_ABI_VERSION < 10301 - static // when these members are static, ABI compatibility with 1.3.0 is respected -#endif int no_fullscreen_w; -#if FLTK_ABI_VERSION < 10301 - static // when these members are static, ABI compatibility with 1.3.0 is respected -#endif int no_fullscreen_h; -#if FLTK_ABI_VERSION < 10303 - static // when these members are static, ABI compatibility with 1.3.0 is respected -#endif int fullscreen_screen_top; -#if FLTK_ABI_VERSION < 10303 - static // when these members are static, ABI compatibility with 1.3.0 is respected -#endif int fullscreen_screen_bottom; -#if FLTK_ABI_VERSION < 10303 - static // when these members are static, ABI compatibility with 1.3.0 is respected -#endif int fullscreen_screen_left; -#if FLTK_ABI_VERSION < 10303 - static // when these members are static, ABI compatibility with 1.3.0 is respected -#endif int fullscreen_screen_right; friend class Fl_X; @@ -121,10 +97,6 @@ class FL_EXPORT Fl_Window : public Fl_Group { uchar size_range_set; // cursor stuff Fl_Cursor cursor_default; -#if FLTK_ABI_VERSION < 10303 - // legacy, not used - Fl_Color cursor_fg, cursor_bg; -#endif protected: /** Data supporting a non-rectangular window shape */ @@ -145,9 +117,6 @@ protected: Fl_Bitmap *todelete_; ///< auxiliary bitmap image }; -#if FLTK_ABI_VERSION < 10303 && !defined(FL_DOXYGEN) - static -#endif shape_data_type *shape_data_; ///< non-null means the window has a non-rectangular shape private: void shape_bitmap_(Fl_Image* b); -- cgit v1.2.3