From 5438954d8c6213f1b0cc9d23b70ffaae388e1d60 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 18 Dec 2021 22:42:30 +0100 Subject: Generate FL/fl_config.h rather than FL/abi-version.h ... as discussed in fltk.coredev in thread "RFC: introduce public config header ", 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 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 in Cairo demo program which is no longer required in Cairo programs since FLTK 1.4.0 --- src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/drivers/WinAPI') diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx index c935b7f4c..a3bf07a82 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx @@ -1,5 +1,5 @@ // -// Definition of Apple Cocoa window driver. +// Definition of Windows window driver for the Fast Light Tool Kit (FLTK). // // Copyright 1998-2021 by Bill Spitzak and others. // @@ -16,8 +16,8 @@ #include -#include #include +#include #include #include #include @@ -495,7 +495,7 @@ void Fl_WinAPI_Window_Driver::hide() { fl_release_dc(fl_window, (HDC)fl_graphics_driver->gc()); fl_window = (HWND)-1; fl_graphics_driver->gc(0); -# ifdef FLTK_USE_CAIRO +# ifdef FLTK_HAVE_CAIROEXT if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0); # endif } -- cgit v1.2.3