From b252e5e45cfd87da48133a3a52e3ac164759b231 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 15 Mar 2025 23:34:56 +0100 Subject: Remove libfltk_cairo (fltk::cairo) This library is no longer needed and was "empty" for backwards compatibility since FLTK 1.4.0. --- FL/Fl.H | 16 +++++++++------- FL/Fl_Cairo.H | 7 +++---- FL/Fl_Cairo_Window.H | 4 ++-- 3 files changed, 14 insertions(+), 13 deletions(-) (limited to 'FL') diff --git a/FL/Fl.H b/FL/Fl.H index 952cfa59b..578971348 100644 --- a/FL/Fl.H +++ b/FL/Fl.H @@ -1,7 +1,7 @@ // // Main header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2024 by Bill Spitzak and others. +// Copyright 1998-2025 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 @@ -1449,7 +1449,7 @@ public: In this last case, you don't need anymore to call Fl::cairo_make_current(). You can use Fl::cairo_cc() to get the current Cairo context anytime. - \note Only available when configure has the --enable-cairo option + \note Only available if built with CMake option FLTK_OPTION_CAIRO_WINDOW=ON. */ static void cairo_autolink_context(bool alink) { cairo_state_.autolink(alink); @@ -1460,8 +1460,9 @@ public: \retval false if no Cairo context autolink is made for each window. \retval true if any fltk window is attached a Cairo context when it is current. \see void cairo_autolink_context(bool alink) - \note Only available when configure has the --enable-cairo option - */ + + \note Only available if built with CMake option FLTK_OPTION_CAIRO_EXT=ON. + */ static bool cairo_autolink_context() { return cairo_state_.autolink(); } @@ -1473,7 +1474,8 @@ public: /** Sets the current Cairo context to \p c. Set \p own to true if you want fltk to handle this cc deletion. - \note Only available when configure has the --enable-Cairo option + + \note Only available if built with CMake option FLTK_OPTION_CAIRO_WINDOW=ON. */ static void cairo_cc(cairo_t *c, bool own=false) { cairo_state_.cc(c, own); @@ -1498,8 +1500,8 @@ public: Fl::cairo_flush(cc); // flush Cairo drawings to the device \endcode - If you configure FLTK with \c '--enable-cairo' or CMake option - \c 'FLTK_OPTION_CAIRO_WINDOW' (i.e. without \c '--enable-cairoext' or CMake option + If you configure FLTK with CMake option + \c 'FLTK_OPTION_CAIRO_WINDOW' (i.e. without CMake option \c 'FLTK_OPTION_CAIRO_EXT') or if you don't enable the \c 'autolink' Cairo context you may do the equivalent to use Cairo drawings in an overridden draw() method of derived classes by using diff --git a/FL/Fl_Cairo.H b/FL/Fl_Cairo.H index cf43de421..51639c980 100644 --- a/FL/Fl_Cairo.H +++ b/FL/Fl_Cairo.H @@ -1,7 +1,7 @@ // // Main Cairo support header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2023 by Bill Spitzak and others. +// Copyright 1998-2025 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 @@ -49,9 +49,8 @@ A private internal & unique corresponding object is created to permit cairo context state handling while keeping it opaque. For internal use only. - \note Only available when configure has the --enable-cairo or - --enable-cairoext option or one or both of the CMake options - FLTK_OPTION_CAIRO_WINDOW or FLTK_OPTION_CAIRO_EXT is set (ON) + \note Only available if one or both of the CMake options + FLTK_OPTION_CAIRO_WINDOW or FLTK_OPTION_CAIRO_EXT is set (ON). */ class FL_EXPORT Fl_Cairo_State { public: diff --git a/FL/Fl_Cairo_Window.H b/FL/Fl_Cairo_Window.H index ebffb51ce..658819175 100644 --- a/FL/Fl_Cairo_Window.H +++ b/FL/Fl_Cairo_Window.H @@ -1,7 +1,7 @@ // // Fl_Cairo_Window header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2023 by Bill Spitzak and others. +// Copyright 1998-2025 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 @@ -78,7 +78,7 @@ \see test/cairo_test.cxx \note Class Fl_Cairo_Window requires the FLTK library to have been built with - CMake option FLTK_OPTION_CAIRO_WINDOW or configure --enable-cairo. + CMake option FLTK_OPTION_CAIRO_WINDOW or FLTK_OPTION_CAIRO_EXT. \note You can alternatively define your custom Cairo FLTK window, and thus at least override the draw() method to provide custom Cairo -- cgit v1.2.3