Merge branch 'branch-1.3' of https://github.com/fltk/fltk into branch-1.3

.travis.yml

@@ -0,0 +1,69 @@
+sudo: required
+dist: trusty
+cache: ccache
+
+language:
+  - c++
+
+os:
+  - linux
+  - osx
+
+compiler:
+  - gcc
+  - clang
+
+env:
+  - |
+    DOC=false
+
+matrix:
+  include:
+    os: linux
+    compiler: clang
+    env: DOC=true
+
+branches:
+  only:
+  - branch-1.3
+
+before_script:
+  - |
+    if [ $TRAVIS_OS_NAME = linux ]; then
+       sudo apt-get update -q
+       sudo apt-get install -y libxinerama-dev libxcursor-dev libasound2-dev
+       sudo apt-get install -y doxygen
+    elif [ $TRAVIS_OS_NAME = osx ]; then
+      brew install ccache # need to install on OSX
+      export PATH="/usr/local/opt/ccache/libexec:$PATH"
+      brew install doxygen
+    fi
+
+script:
+  - |
+    date
+    make
+    date
+    mkdir cmake-build
+    cd cmake-build
+    cmake -G "Unix Makefiles" ..
+    date
+    make
+    date
+    cd -
+
+after_success:
+  - |
+    if [ $DOC = "true" ]; then
+      doxygen --version
+      date
+      cd documentation
+      make html
+      cd -
+      date
+    fi
+
+notifications:
+  email:
+    recipients:
+      - albrechts.fltk@online.de

README.abi-version.txt

@@ -58,13 +58,16 @@ the version number.
 (1) Traditional configure + make (Unix, Linux, MinGW etc.)
 ----------------------------------------------------------
 
-	Run
+    Run
+	make clean
+	./configure --with-abiversion=10304
+	make
 
-		./configure --with-abiversion=10304
-		make
-
-	This will generate FL/abi-version.h and build FLTK as usual.
+    This will generate FL/abi-version.h and build FLTK as usual.
 
+    Note: you should always make sure that you compile everything from
+    scratch if you change the ABI version or any other configuration
+    options, e.g. with `make clean'.
 
 (2) CMake + make
 ----------------
@@ -104,6 +107,9 @@ the version number.
 	will copy the file abi-version.ide to FL/abi-version.h and run the
 	build with the defined ABI version.
 
+	Note: you should always make sure that you compile everything from
+	scratch if you change the ABI version or any other configuration
+	options, e.g. with "Clean all" or "Rebuild all" menu functions.
 
 Note on CMake:
 

test/Makefile

@@ -3,7 +3,7 @@
 #
 # Test/example program makefile for the Fast Light Tool Kit (FLTK).
 #
-# Copyright 1998-2010 by Bill Spitzak and others.
+# Copyright 1998-2019 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,6 +49,7 @@ CPPFILES =\
 	fonts.cxx \
 	forms.cxx \
 	fractals.cxx \
+	fracviewer.cxx \
 	fullscreen.cxx \
 	gl_overlay.cxx \
 	glpuzzle.cxx \
@@ -286,7 +287,7 @@ unittests$(EXEEXT): unittests.o
 
 unittests.o: unittests.cxx unittest_about.cxx unittest_points.cxx unittest_lines.cxx unittest_circles.cxx \
 	unittest_rects.cxx unittest_text.cxx unittest_symbol.cxx unittest_viewport.cxx unittest_images.cxx \
-	unittest_schemes.cxx
+	unittest_schemes.cxx unittest_scrollbarsize.cxx
 
 adjuster$(EXEEXT): adjuster.o
 

test/makedepend

@@ -284,6 +284,11 @@ fractals.o: ../FL/abi-version.h ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Fl.H
 fractals.o: ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H ../FL/Fl_Group.H
 fractals.o: ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/glu.h
 fractals.o: fracviewer.h ../FL/Fl_Button.H ../FL/Fl_Group.H ../FL/Fl_Window.H
+fracviewer.o: ../config.h ../FL/glut.H ../FL/gl.h ../FL/Enumerations.H
+fracviewer.o: ../FL/abi-version.h ../FL/Fl_Export.H ../FL/fl_types.h
+fracviewer.o: ../FL/Fl.H ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H
+fracviewer.o: ../FL/Fl_Group.H ../FL/Fl_Widget.H ../FL/Fl_Bitmap.H
+fracviewer.o: ../FL/Fl_Image.H ../FL/glu.h fracviewer.h
 fullscreen.o: ../config.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/fl_utf8.h
 fullscreen.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
 fullscreen.o: ../FL/abi-version.h ../FL/Fl_Single_Window.H ../FL/Fl_Window.H