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 /test/cairo_test.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 'test/cairo_test.cxx')
| -rw-r--r-- | test/cairo_test.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/test/cairo_test.cxx b/test/cairo_test.cxx index d2808e8d8..1fbdb0c90 100644 --- a/test/cairo_test.cxx +++ b/test/cairo_test.cxx @@ -1,7 +1,7 @@ // // Cairo drawing test program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2019 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 @@ -14,15 +14,16 @@ // https://www.fltk.org/bugs.php // -#include <config.h> +#include <FL/Fl.H> // includes <FL/fl_config.h> -#ifdef FLTK_HAVE_CAIRO +#ifdef FLTK_HAVE_CAIRO // defined in <FL/fl_config.h> since FLTK 1.4.0 #include <FL/Fl_Cairo_Window.H> #include <FL/Fl_Box.H> #include <FL/platform.H> #include <FL/fl_draw.H> #include <FL/math.h> + #define DEF_WIDTH 0.03 // uncomment the following line to enable Cairo context autolink feature: @@ -145,7 +146,9 @@ int main(int argc, char **argv) { return Fl::run(); } -#else + +#else // (!FLTK_HAVE_CAIRO) + #include <FL/fl_ask.H> int main(int argc, char **argv) { @@ -155,4 +158,4 @@ int main(int argc, char **argv) { "or one of the CMake options OPTION_CAIRO or OPTION_CAIROEXT, respectively."); return 0; } -#endif +#endif // (FLTK_HAVE_CAIRO) |