diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-12-18 22:42:30 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2021-12-18 22:44:08 +0100 |
| commit | 5438954d8c6213f1b0cc9d23b70ffaae388e1d60 (patch) | |
| tree | 101eeda4bf98583d566eeb4b0870d2bde95dea69 /src/fl_overlay.cxx | |
| parent | 797616841caaf3322c79c15b1d9c74d03b54ea12 (diff) | |
Generate FL/fl_config.h rather than FL/abi-version.h
... as discussed in fltk.coredev in thread "RFC: introduce public
config header <FL/fl_config.h>", see:
https://groups.google.com/g/fltkcoredev/c/xLCs1AIXMVo/m/MHZpQggzAQAJ
- Rename abi-version.h to fl_config.h, rename input files,
update dependencies, .gitignore, CMake, configure and Makefiles.
- Include Cairo options in FL/fl_config.h
- Rename FLTK_USE_CAIRO to FLTK_HAVE_CAIROEXT for consistency.
- Include <FL/fl_config.h> in config.h and wherever necessary,
fix include order (move FL/Fl.H to the top) and more.
- Move USE_X11 to fl_config.h and rename to FLTK_USE_X11
- Do not include <config.h> in Cairo demo program which is no
longer required in Cairo programs since FLTK 1.4.0
Diffstat (limited to 'src/fl_overlay.cxx')
| -rw-r--r-- | src/fl_overlay.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fl_overlay.cxx b/src/fl_overlay.cxx index 860b75ae8..0c2d0db11 100644 --- a/src/fl_overlay.cxx +++ b/src/fl_overlay.cxx @@ -1,7 +1,7 @@ // // Overlay support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2018 by Bill Spitzak and others. +// Copyright 1998-2021 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -19,6 +19,7 @@ // to erase the overlay before drawing anything that might intersect // it. +#include <FL/fl_config.h> #include <FL/platform.H> #include <FL/fl_draw.H> @@ -42,7 +43,7 @@ static int bgx, bgy, bgw, bgh; static void draw_current_rect() { #ifdef USE_XOR -# if defined(USE_X11) +# if defined(FLTK_USE_X11) GC gc = (GC)fl_graphics_driver->gc(); XSetFunction(fl_display, gc, GXxor); XSetForeground(fl_display, gc, 0xffffffff); |