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 /FL/platform.H | |
| 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 'FL/platform.H')
| -rw-r--r-- | FL/platform.H | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/FL/platform.H b/FL/platform.H index 7271b1feb..b1a61c09b 100644 --- a/FL/platform.H +++ b/FL/platform.H @@ -1,7 +1,7 @@ // // Platform header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2020 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 @@ -28,6 +28,7 @@ #if !defined(FL_PLATFORM_H) && !defined(FL_DOXYGEN) # define FL_PLATFORM_H +# include <FL/fl_config.h> # include <FL/Fl_Export.H> # include <FL/platform_types.h> # include <FL/fl_types.h> // for uchar @@ -42,9 +43,6 @@ class Fl_Window; # else // X11 # include <FL/fl_types.h> # include <FL/Enumerations.H> -# if !defined(USE_X11) -# define USE_X11 1 -# endif # if defined(_ABIN32) || defined(_ABI64) // fix for broken SGI Irix X .h files # pragma set woff 3322 # endif @@ -125,7 +123,7 @@ public: // static variables, static functions and member functions static Fl_X* first; static Fl_X* i(const Fl_Window* w) {return (Fl_X*)w->i;} -# if defined(USE_X11) // for backward compatibility +# if defined(FLTK_USE_X11) // for backward compatibility static void make_xid(Fl_Window*, XVisualInfo* =fl_visual, Colormap=fl_colormap); static Fl_X* set_xid(Fl_Window*, Window); # endif |