diff options
| author | Manolo Gouy <Manolo> | 2016-01-27 18:11:20 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-01-27 18:11:20 +0000 |
| commit | 8e3f66073f8e30e874eb3e6cf76ab0a614c39aad (patch) | |
| tree | de1aaad8e102b792439c7cdef6dbb826d6d1ae90 /FL/Fl_Scroll.H | |
| parent | 1c4661c4816d9e9b8cc37165a554a4d60c5339da (diff) | |
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
Diffstat (limited to 'FL/Fl_Scroll.H')
| -rw-r--r-- | FL/Fl_Scroll.H | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/FL/Fl_Scroll.H b/FL/Fl_Scroll.H index f1c2deca6..f7192a01d 100644 --- a/FL/Fl_Scroll.H +++ b/FL/Fl_Scroll.H @@ -94,16 +94,12 @@ class FL_EXPORT Fl_Scroll : public Fl_Group { void fix_scrollbar_order(); static void draw_clip(void*,int,int,int,int); -#if FLTK_ABI_VERSION >= 10303 -protected: // NEW (STR#1895) -#else -private: // OLD -#endif +protected: // (STR#1895) /** Structure to manage scrollbar and widget interior sizes. This is filled out by recalc_scrollbars() for use in calculations that need to know the visible scroll area size, etc. - \note Availability in FLTK_ABI_VERSION 10303 or higher. + \note Availability in FL_ABI_VERSION 10303 or higher. */ typedef struct { /// A local struct to manage a region defined by xywh |