From 26f5b38a0113be817d13193387913580b5996d77 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Thu, 14 Mar 2024 17:16:43 +0100 Subject: [PATCH] Update documentation, remove/edit explicit FLTK versions ... to simplify further version updates. Add more deprecation notices concerning autotools/configure to README.Unix.txt. --- README.Unix.txt | 44 ++++++++++++++++++++++++++++++----------- test/ask.cxx | 15 +++++++------- test/grid_alignment.cxx | 4 ++-- 3 files changed, 43 insertions(+), 20 deletions(-) diff --git a/README.Unix.txt b/README.Unix.txt index cab1008b2..41db419fa 100644 --- a/README.Unix.txt +++ b/README.Unix.txt @@ -20,7 +20,7 @@ README.Unix.txt - Building FLTK on Unix/Linux Systems 3 How to Build FLTK Using GCC 3.1 Downloading and Unpacking 3.2 Configuration and Build Systems - 3.3 Configuring FLTK with autoconf and configure + 3.3 Configuring FLTK with autoconf and configure (deprecated) 3.4 Building FLTK 3.5 Testing FLTK 3.6 Installing FLTK @@ -32,6 +32,13 @@ README.Unix.txt - Building FLTK on Unix/Linux Systems [*] TODO: we still need to write these chapters +------------------------------------------------------------------- + Note: usage of autotools, configure, and the included Makefiles + to build the FLTK library is deprecated since FLTK 1.4 and will + be removed in the next minor version (1.5). + Please consider using CMake instead. +------------------------------------------------------------------- + 1 Introduction ================= @@ -298,23 +305,38 @@ The following paragraphs describe the "classic" build system with autoconf, configure, and make that has been used to build FLTK up to version 1.3.x and can still be used with FLTK 1.4.x. -However, the FLTK team recommend using CMake which is the preferred build -system since FLTK 1.4.0 used for all platforms (including Windows). CMake -is used instead of autoconf and configure to create the build system of your -choice, for instance Makefiles, Ninja build files, Visual Studio projects, etc. +However, the FLTK team recommend to use CMake which is the preferred build +system generator since FLTK 1.4 used for all platforms (including Windows). +CMake can be used to create the build system of your choice, for instance +Makefiles, Ninja build files, Xcode or Visual Studio IDE projects etc.. + +------------------------------------------------------------------- + Note: usage of autotools, configure, and the included Makefiles + to build the FLTK library is deprecated since FLTK 1.4 and will + be removed in the next minor version (1.5). + Please consider using CMake instead. +------------------------------------------------------------------- Please see README.CMake.txt for how to build FLTK and your application programs using CMake. You can stop reading here if you do this. -You can, of course, build FLTK with CMake and your own application(s) with -your existing and well-known build system. +You can, of course, build FLTK with CMake and your own application(s) +with your existing and well-known build system. -If you like the "classic" build system more, continue reading the following -chapters ... +If you like the "classic" build system more, continue reading the +following chapters but please be aware that configure support will +be removed in FLTK 1.5. - 3.3 Configuring FLTK with autoconf and configure ---------------------------------------------------- + 3.3 Configuring FLTK with autoconf and configure (deprecated) +---------------------------------------------------------------- + +------------------------------------------------------------------- + Note: usage of autotools, configure, and the included Makefiles + to build the FLTK library is deprecated since FLTK 1.4 and will + be removed in the next minor version (1.5). + Please consider using CMake instead. +------------------------------------------------------------------- If you got FLTK via git then you need one extra step. Otherwise skip over this part. Stay in your FLTK source-code directory and type: diff --git a/test/ask.cxx b/test/ask.cxx index 9ff06b45a..527b43dfa 100644 --- a/test/ask.cxx +++ b/test/ask.cxx @@ -4,7 +4,7 @@ // This also demonstrates how to trap attempts by the user to // close the last window by overriding Fl::exit // -// Copyright 1998-2021 by Bill Spitzak and others. +// Copyright 1998-2024 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 @@ -90,10 +90,11 @@ void window_callback(Fl_Widget *win, void *) { "Close" button will reactivate the popups (only possible if "recursive" dialogs are enabled, see below). - Note 1: This dialog box had been blocked in FLTK 1.3.x if another common - dialog was already open because the window used was a static (i.e. permanently - allocated) Fl_Window instance. This has been fixed in FLTK 1.4.0. - See STR #334 (sic !) and also STR #2751 ("Limit input field characters"). + Note 1: This dialog box had been blocked in FLTK 1.3 if another common + dialog was already open because the used window was a static (i.e. + permanently allocated) Fl_Window instance. This has been fixed in FLTK 1.4. + See STR #334 ("technical change : remove statics in fl_ask") and also + STR #2751 ("Limit input field characters"). */ void timer_cb(void *) { @@ -132,10 +133,10 @@ void timer_cb(void *) { // pop up a message: stop |= fl_choice( "Timeout. Click the 'Close' button or press Escape.\n" - "Note: this message had been blocked in FLTK 1.3.x\n" + "Note: this message had been blocked in FLTK 1.3\n" "and earlier if another message window was open.\n" "This message should pop up every 5 seconds (max. 10 times)\n" - "in FLTK 1.4.0 and later until stopped by clicking the button\n" + "in FLTK 1.4 and later until stopped by clicking the button\n" "below or by pressing the Enter (Return) key.\n", "Close", "Stop these funny popups", NULL); } diff --git a/test/grid_alignment.cxx b/test/grid_alignment.cxx index 59a5368c3..d16ea086f 100644 --- a/test/grid_alignment.cxx +++ b/test/grid_alignment.cxx @@ -2,7 +2,7 @@ // Fl_Grid demo program for the Fast Light Tool Kit (FLTK). // // Copyright 2021 by Albrecht Schlosser -// Copyright 2022-2023 by Bill Spitzak and others. +// Copyright 2022-2024 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 @@ -61,7 +61,7 @@ void remove_cb(void *v) { int main(int argc, char **argv) { Fl_Grid::Cell *c; Fl_Box *b; - Fl_Double_Window *win = new Fl_Double_Window(440, 350, "FLTK 1.4.0 - Fl_Grid Alignment Test"); + Fl_Double_Window *win = new Fl_Double_Window(440, 350, "Fl_Grid Alignment Test"); Fl_Grid *grid = new Fl_Grid(10, 10, 420, 330); grid->layout(7, 7, 8, 4); // cols, rows, margin, gap grid->box(FL_FLAT_BOX);