[branch-1.3] 1eaf87b - Minor CMake, docs, and test program updates

GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[branch-1.3] 1eaf87b - Minor CMake, docs, and test program updates "Albrecht Schlosser" 11:02 Sep 19 top right image
 
commit 1eaf87b2455b3011b5c488a211edf2b58163a56b
Author:     Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Sat Sep 19 19:38:09 2020 +0200
Commit:     Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Sat Sep 19 19:47:18 2020 +0200

    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 CHANGES CHANGES
index 9f495a9..79773f2 100644
--- CHANGES
+++ 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 CMake/posixScandir.cxx CMake/posixScandir.cxx
index ea57e9c..8b91428 100644
--- CMake/posixScandir.cxx
+++ 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 CMake/resources.cmake CMake/resources.cmake
index 37c0c08..88b0c37 100644
--- CMake/resources.cmake
+++ 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 documentation/src/forms.dox documentation/src/forms.dox
index c2379e9..cd759be 100644
--- documentation/src/forms.dox
+++ documentation/src/forms.dox
@@ -9,8 +9,8 @@ This appendix describes the Forms compatibility included with FLTK.
 <table border="1" width="90%" bgcolor="#cccccc">
 <tr>
 <th align="center">
-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
 </th>
 </tr>
 </table>
diff --git test/help-test.html test/help-test.html
index 9f4dcca..01809f2 100644
--- test/help-test.html
+++ test/help-test.html
@@ -173,7 +173,9 @@ End of DL.
 <P>
 <B>Simple Two Column Table With Borders And Heading</B>
 <TABLE BORDER=1>
-  <TH>Table Heading</TH>
+  <TR>
+    <TH>Table Heading</TH>
+  </TR>
   <TR>
     <TD>Column 1</TD>  <TD>Column 2</TD>
   </TR><TR>
@@ -187,7 +189,9 @@ End of DL.
 <P>
 <B>Simple Bordered Table With Heading And 10 Cell Padding + Spacing</B>
 <TABLE BORDER=1 CELLPADDING=10 CELLSPACING=10>
-  <TH>Table Heading</TH>
+  <TR>
+    <TH>Table Heading</TH>
+  </TR>
   <TR>
     <TD>Column 1</TD>  <TD>Column 2</TD>
   </TR><TR>
@@ -201,7 +205,9 @@ End of DL.
 <P>
 <B>Simple Table Of Images, Two Columns, Three Rows</B>
 <TABLE BORDER=1 CELLPADDING=10 CELLSPACING=10>
-  <TH>Table Heading</TH>
+  <TR>
+    <TH>Table Heading</TH>
+  </TR>
   <TR>
     <TD>Column 1</TD>  <TD>Column 2</TD>
   </TR><TR>
Direct Link to Message ]
 
bottom left image   bottom right image
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2020 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.