From 1eaf87b2455b3011b5c488a211edf2b58163a56b Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 19 Sep 2020 19:38:09 +0200 Subject: [PATCH] Minor CMake, docs, and test program updates Fix bug in CMake/posixScandir.cxx (backported from 1.4). Fix table structure in test/help-test.html (backported from 1.4). Clarify that the deprecated forms compatibility *may* be removed in FLTK 1.4 --- CHANGES | 8 +++++--- CMake/posixScandir.cxx | 1 + CMake/resources.cmake | 2 +- documentation/src/forms.dox | 4 ++-- test/help-test.html | 12 +++++++++--- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 9f495a92e..79773f23d 100644 --- a/CHANGES +++ b/CHANGES @@ -5,18 +5,20 @@ Bug fixes and other improvements Note to devs: the following list was created with: $ git shortlog release-1.3.5.. | sed -e's/^ //' | sed -e's/^/ /' - Albrecht Schlosser (6): + Albrecht Schlosser (8): Fix Fl::add_timeout() in draw() under Linux (STR 3188) Fix trailing whitespace in CHANGES X11: Fix X Input Methods (XIM) (STR 3502, 3192) Minor CMake updates (formatting) Fix overly restrictive JPEG filter (#81) Fix DND in read-only Fl_Input (Fl_Output) (#113) + Update CHANGES and dependencies + Minor CMake, docs, and test program updates Greg Ercolano (1): fixes issue92, added -d debug flag to fluid - ManoloFLTK (12): + ManoloFLTK (13): X11: add support for copy+paste of image within one app Windows: add bitmap version of graphics when copying to clipboard Fix use of Xrender extension with old, 16-bit framebuffers. @@ -29,7 +31,7 @@ Bug fixes and other improvements Set OPTION_USE_SYSTEM_LIBPNG/JPEG off under macOS by default Have Fl_Pack::draw() call Fl_Group::init_sizes() on its parent group. CMake support of the Darwin+XQuartz test platform - Add support for macOS 10.15 "Catalina" and 11.0 "Big Sur". + Add support of macOS "Big Sur" 11.0 OKAMURA, Yasunobu (1): Fix JIS Keyboard dead keys diff --git a/CMake/posixScandir.cxx b/CMake/posixScandir.cxx index ea57e9ce2..8b91428b5 100644 --- a/CMake/posixScandir.cxx +++ b/CMake/posixScandir.cxx @@ -3,6 +3,7 @@ int func (const char *d, dirent ***list, void *sort) { int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort); + return n; } int main() { diff --git a/CMake/resources.cmake b/CMake/resources.cmake index 37c0c08ef..88b0c37ab 100644 --- a/CMake/resources.cmake +++ b/CMake/resources.cmake @@ -50,7 +50,7 @@ endif (MSVC) # Simulate the behavior of autoconf macro AC_HEADER_DIRENT, see: # https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Particular-Headers.html # "Check for the following header files. For the first one that is found -# and defines ‘DIR’, define the listed C preprocessor macro ..." +# and defines 'DIR', define the listed C preprocessor macro ..." # # Note: we don't check if it really defines 'DIR', but we stop processing # once we found the first suitable header file. diff --git a/documentation/src/forms.dox b/documentation/src/forms.dox index c2379e983..cd759beb7 100644 --- a/documentation/src/forms.dox +++ b/documentation/src/forms.dox @@ -9,8 +9,8 @@ This appendix describes the Forms compatibility included with FLTK.
-Warning: The Forms compatility is deprecated and no longer maintained in FLTK1, -and is likely to be removed completely after the next official release. +Warning: The Forms compatibility is deprecated and no longer maintained +in FLTK 1.3, and is likely to be removed completely in FLTK 1.4
diff --git a/test/help-test.html b/test/help-test.html index 9f4dccaca..01809f234 100644 --- a/test/help-test.html +++ b/test/help-test.html @@ -173,7 +173,9 @@ End of DL.

Simple Two Column Table With Borders And Heading - + + + @@ -187,7 +189,9 @@ End of DL.

Simple Bordered Table With Heading And 10 Cell Padding + Spacing

Table Heading
Table Heading
Column 1 Column 2
- + + + @@ -201,7 +205,9 @@ End of DL.

Simple Table Of Images, Two Columns, Three Rows

Table Heading
Table Heading
Column 1 Column 2
- + + +
Table Heading
Table Heading
Column 1 Column 2