diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-30 00:56:42 +0000 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2016-01-30 00:56:42 +0000 |
| commit | 00dd296ff202631dc0d773755e970fcca5a25f68 (patch) | |
| tree | 5f3416102a13aa00a98199e10d902f807a8a4272 | |
| parent | 39c943ac8f744ad0809c185632d5ef5eb92a6369 (diff) | |
Bump version numbers for next minor release: FLTK 1.4.0.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11088 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
48 files changed, 58 insertions, 58 deletions
diff --git a/CMake/setup.cmake b/CMake/setup.cmake index 2befc1fa3..b2d0142f6 100644 --- a/CMake/setup.cmake +++ b/CMake/setup.cmake @@ -22,8 +22,8 @@ ####################################################################### # The FLTK version set(FLTK_VERSION_MAJOR "1") -set(FLTK_VERSION_MINOR "3") -set(FLTK_VERSION_PATCH "4") +set(FLTK_VERSION_MINOR "4") +set(FLTK_VERSION_PATCH "0") set(FLTK_VERSION "${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR}") set(FLTK_VERSION_FULL "${FLTK_VERSION}.${FLTK_VERSION_PATCH}") @@ -1,4 +1,4 @@ -CREDITS - Fast Light Tool Kit (FLTK) Version 1.3.4 +CREDITS - Fast Light Tool Kit (FLTK) Version 1.4.0 -------------------------------------------------- This file lists the people responsible for the toolkit you are diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 19da48ac5..4bfba5052 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -69,14 +69,14 @@ FLTK remains mostly source-code compatible between minor version changes. */ -#define FL_MINOR_VERSION 3 +#define FL_MINOR_VERSION 4 /** The patch version for this library. FLTK remains binary compatible between patches. */ -#define FL_PATCH_VERSION 4 +#define FL_PATCH_VERSION 0 /** The FLTK version number as a \em double. diff --git a/FL/Fl_File_Chooser.H b/FL/Fl_File_Chooser.H index 1b982fe3d..4dfccb8d9 100644 --- a/FL/Fl_File_Chooser.H +++ b/FL/Fl_File_Chooser.H @@ -23,7 +23,7 @@ // ========================================================================= // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #ifndef Fl_File_Chooser_H #define Fl_File_Chooser_H diff --git a/FL/Fl_Help_Dialog.H b/FL/Fl_Help_Dialog.H index 0c88a444c..9e44c2e3d 100644 --- a/FL/Fl_Help_Dialog.H +++ b/FL/Fl_Help_Dialog.H @@ -23,7 +23,7 @@ // ======================================================================== // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #ifndef Fl_Help_Dialog_H #define Fl_Help_Dialog_H @@ -1,4 +1,4 @@ -README - Fast Light Tool Kit (FLTK) Version 1.3.4 +README - Fast Light Tool Kit (FLTK) Version 1.4.0 ------------------------------------------------- WHAT IS FLTK? @@ -1 +1 @@ -1.3.4 +1.4.0 diff --git a/configure.in b/configure.in index c8c37ff46..cd3f5fe88 100644 --- a/configure.in +++ b/configure.in @@ -51,8 +51,8 @@ esac dnl FLTK library versions... FL_MAJOR_VERSION=1 -FL_MINOR_VERSION=3 -FL_PATCH_VERSION=4 +FL_MINOR_VERSION=4 +FL_PATCH_VERSION=0 FL_DSO_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} FL_ABI_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.0 FL_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}.${FL_PATCH_VERSION} diff --git a/documentation/src/enumerations.dox b/documentation/src/enumerations.dox index db137ead1..9a68aa5fd 100644 --- a/documentation/src/enumerations.dox +++ b/documentation/src/enumerations.dox @@ -19,16 +19,16 @@ this is often useful to know when programming. The FLTK version number is stored in a number of compile-time constants: - FL_MAJOR_VERSION - The major release number, currently 1 - - FL_MINOR_VERSION - The minor release number, currently 3 - - FL_PATCH_VERSION - The patch release number, currently 4 + - FL_MINOR_VERSION - The minor release number, currently 4 + - FL_PATCH_VERSION - The patch release number, currently 0 - FL_VERSION - \b [Deprecated] A combined floating-point version number for - the major, minor, and patch release numbers, currently 1.0304 + the major, minor, and patch release numbers, currently 1.0400 - FL_API_VERSION - A combined integer version number for the major, minor, - and patch release numbers, currently 10304 (use this instead of + and patch release numbers, currently 10400 (use this instead of FL_VERSION, if possible) - FL_ABI_VERSION - A combined integer version number for the application binary interface (ABI) major, minor, and patch release numbers, - currently 10300 (default) + currently 10400 (default) \note The ABI version (FL_ABI_VERSION) is usually constant throughout one major/minor release version, for instance 10300 if FL_API_VERSION is 10304. diff --git a/documentation/src/fltk-book.tex.in b/documentation/src/fltk-book.tex.in index 13361ba24..3f86c6d03 100644 --- a/documentation/src/fltk-book.tex.in +++ b/documentation/src/fltk-book.tex.in @@ -41,7 +41,7 @@ \end{ImageNoCaption}\\ \vspace*{2cm} {\Large -Revision 9 by F. Costantini, D. Gibson, M. Melcher, \\ +Revision 10 by F. Costantini, D. Gibson, M. Melcher, \\ A. Schlosser, B. Spitzak, and M. Sweet.}\\ \vspace*{1.5cm} {\large Copyright 1998-@YEAR@ by Bill Spitzak and others.}\\ diff --git a/documentation/src/index.dox b/documentation/src/index.dox index 9df3a91ce..7dc5ab81a 100644 --- a/documentation/src/index.dox +++ b/documentation/src/index.dox @@ -8,9 +8,9 @@ \image latex FL200.png "" width=5cm </CENTER></TD> <TD><CENTER> - <B>FLTK 1.3.4 Programming Manual</B> + <B>FLTK 1.4.0 Programming Manual</B> - Revision 9 by F. Costantini, D. Gibson, M. Melcher, + Revision 10 by F. Costantini, D. Gibson, M. Melcher, A. Schlosser, B. Spitzak and M. Sweet. Copyright 1998-2015 by Bill Spitzak and others. diff --git a/documentation/src/preface.dox b/documentation/src/preface.dox index 30d69a1e2..e74add8f8 100644 --- a/documentation/src/preface.dox +++ b/documentation/src/preface.dox @@ -3,7 +3,7 @@ \page preface Preface This manual describes the Fast Light Tool Kit ("FLTK") -version 1.3.4, a C++ Graphical User Interface +version 1.4.0, a C++ Graphical User Interface ("GUI") toolkit for UNIX, Microsoft Windows and Apple OS X. Each of the chapters in this manual is designed as a tutorial for using FLTK, while the appendices provide a convenient reference diff --git a/fluid/about_panel.cxx b/fluid/about_panel.cxx index 58f0fd479..9d96ab082 100644 --- a/fluid/about_panel.cxx +++ b/fluid/about_panel.cxx @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #include "about_panel.h" void show_help(const char *name); diff --git a/fluid/about_panel.fl b/fluid/about_panel.fl index 6d4e9a849..0ec6ab721 100644 --- a/fluid/about_panel.fl +++ b/fluid/about_panel.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} comment {// diff --git a/fluid/about_panel.h b/fluid/about_panel.h index 8db966afb..648916d9d 100644 --- a/fluid/about_panel.h +++ b/fluid/about_panel.h @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #ifndef about_panel_h #define about_panel_h diff --git a/fluid/alignment_panel.cxx b/fluid/alignment_panel.cxx index f3e0d0af5..84d38e46b 100644 --- a/fluid/alignment_panel.cxx +++ b/fluid/alignment_panel.cxx @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #include "alignment_panel.h" #include <FL/Fl_Preferences.H> diff --git a/fluid/alignment_panel.fl b/fluid/alignment_panel.fl index e8d67b0fb..b5dc7ffe1 100644 --- a/fluid/alignment_panel.fl +++ b/fluid/alignment_panel.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} comment {// diff --git a/fluid/alignment_panel.h b/fluid/alignment_panel.h index 1d9062a37..c914adec2 100644 --- a/fluid/alignment_panel.h +++ b/fluid/alignment_panel.h @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #ifndef alignment_panel_h #define alignment_panel_h diff --git a/fluid/fluid.app/Contents/Info.plist b/fluid/fluid.app/Contents/Info.plist index 3fd76a555..88cdaa6ac 100644 --- a/fluid/fluid.app/Contents/Info.plist +++ b/fluid/fluid.app/Contents/Info.plist @@ -9,7 +9,7 @@ <key>CFBundleIdentifier</key> <string>org.fltk.fluid</string> <key>CFBundleVersion</key> - <string>1.3.4</string> + <string>1.4.0</string> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>NSHumanReadableCopyright</key> @@ -25,9 +25,9 @@ <key>CFBundleIconFile</key> <string>fluid.icns</string> <key>CFBundleShortVersionString</key> - <string>1.3.4</string> + <string>1.4.0</string> <key>CFBundleGetInfoString</key> - <string>1.3.4, Copyright 1998-2015 by Bill Spitzak and others</string> + <string>1.4.0, Copyright 1998-2015 by Bill Spitzak and others</string> <key>CFBundleDocumentTypes</key> <array> <dict> diff --git a/fluid/function_panel.cxx b/fluid/function_panel.cxx index 1ca0d8285..2988dae60 100644 --- a/fluid/function_panel.cxx +++ b/fluid/function_panel.cxx @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #include "function_panel.h" #include <FL/Fl_Pixmap.H> diff --git a/fluid/function_panel.fl b/fluid/function_panel.fl index 7f02a5774..b1a9d8356 100644 --- a/fluid/function_panel.fl +++ b/fluid/function_panel.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} comment {// diff --git a/fluid/function_panel.h b/fluid/function_panel.h index 86087385a..7cc035176 100644 --- a/fluid/function_panel.h +++ b/fluid/function_panel.h @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #ifndef function_panel_h #define function_panel_h diff --git a/fluid/print_panel.cxx b/fluid/print_panel.cxx index 6f042a982..f9be6533e 100644 --- a/fluid/print_panel.cxx +++ b/fluid/print_panel.cxx @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #include "print_panel.h" #include <stdio.h> diff --git a/fluid/print_panel.fl b/fluid/print_panel.fl index fe3ed4185..d3311149e 100644 --- a/fluid/print_panel.fl +++ b/fluid/print_panel.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} comment {// diff --git a/fluid/print_panel.h b/fluid/print_panel.h index ba7d7123e..6159e80b1 100644 --- a/fluid/print_panel.h +++ b/fluid/print_panel.h @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #ifndef print_panel_h #define print_panel_h diff --git a/fluid/template_panel.cxx b/fluid/template_panel.cxx index dc10ef0ef..57543f4c3 100644 --- a/fluid/template_panel.cxx +++ b/fluid/template_panel.cxx @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #include "template_panel.h" #include <stdio.h> diff --git a/fluid/template_panel.fl b/fluid/template_panel.fl index 987f3615b..7743f829d 100644 --- a/fluid/template_panel.fl +++ b/fluid/template_panel.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} comment {// diff --git a/fluid/template_panel.h b/fluid/template_panel.h index 6437db07b..5481810d7 100644 --- a/fluid/template_panel.h +++ b/fluid/template_panel.h @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #ifndef template_panel_h #define template_panel_h diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx index 59e38c1d2..9d964f95c 100644 --- a/fluid/widget_panel.cxx +++ b/fluid/widget_panel.cxx @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #include "widget_panel.h" extern void comment_cb(Fl_Text_Editor*, void*); diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl index d24bab755..e5ce0f9e1 100644 --- a/fluid/widget_panel.fl +++ b/fluid/widget_panel.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} comment {// diff --git a/fluid/widget_panel.h b/fluid/widget_panel.h index 49cd49192..5c626cb96 100644 --- a/fluid/widget_panel.h +++ b/fluid/widget_panel.h @@ -16,7 +16,7 @@ // http://www.fltk.org/str.php // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #ifndef widget_panel_h #define widget_panel_h diff --git a/ide/Xcode4/Project Templates/FLTK Application/FLTK 1.3/ui.fl b/ide/Xcode4/Project Templates/FLTK Application/FLTK 1.3/ui.fl index 9ca97914c..f9e2f18f9 100644 --- a/ide/Xcode4/Project Templates/FLTK Application/FLTK 1.3/ui.fl +++ b/ide/Xcode4/Project Templates/FLTK Application/FLTK 1.3/ui.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} Function {make_window()} {open diff --git a/ide/Xcode4/plists/Fluid-Info.plist b/ide/Xcode4/plists/Fluid-Info.plist index f7ff23f44..b824debf7 100644 --- a/ide/Xcode4/plists/Fluid-Info.plist +++ b/ide/Xcode4/plists/Fluid-Info.plist @@ -40,7 +40,7 @@ <key>CFBundleSignature</key> <string>FLTK</string> <key>CFBundleVersion</key> - <string>1.3.4</string> + <string>1.4.0</string> <key>NSHumanReadableCopyright</key> <string>Copyright 1998-2015 by Bill Spitzak and others.</string> <key>CFBundleGetInfoString</key> diff --git a/src/Fl_File_Chooser.cxx b/src/Fl_File_Chooser.cxx index c66129087..4b0d27f82 100644 --- a/src/Fl_File_Chooser.cxx +++ b/src/Fl_File_Chooser.cxx @@ -23,7 +23,7 @@ // ======================================================================= // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #include "../FL/Fl_File_Chooser.H" #include <FL/fl_draw.H> diff --git a/src/Fl_File_Chooser.fl b/src/Fl_File_Chooser.fl index 8a244dffc..fca0a32f3 100644 --- a/src/Fl_File_Chooser.fl +++ b/src/Fl_File_Chooser.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {../FL/Fl_File_Chooser.H} code_name {.cxx} comment {// diff --git a/src/Fl_Help_Dialog.cxx b/src/Fl_Help_Dialog.cxx index c052b5456..7b28815b6 100644 --- a/src/Fl_Help_Dialog.cxx +++ b/src/Fl_Help_Dialog.cxx @@ -23,7 +23,7 @@ // ======================================================================== // -// generated by Fast Light User Interface Designer (fluid) version 1.0304 +// generated by Fast Light User Interface Designer (fluid) version 1.0400 #include "../FL/Fl_Help_Dialog.H" #include "flstring.h" diff --git a/src/Fl_Help_Dialog.fl b/src/Fl_Help_Dialog.fl index 76ca0d11e..94727620d 100644 --- a/src/Fl_Help_Dialog.fl +++ b/src/Fl_Help_Dialog.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {../FL/Fl_Help_Dialog.H} code_name {.cxx} comment {// diff --git a/test/CubeViewUI.fl b/test/CubeViewUI.fl index 8fe6060d7..42d97463a 100644 --- a/test/CubeViewUI.fl +++ b/test/CubeViewUI.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} class CubeViewUI {open diff --git a/test/fast_slow.fl b/test/fast_slow.fl index e36faf57b..c4361604a 100644 --- a/test/fast_slow.fl +++ b/test/fast_slow.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} Function {} {open diff --git a/test/inactive.fl b/test/inactive.fl index c441826f2..87ef7c325 100644 --- a/test/inactive.fl +++ b/test/inactive.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} Function {} {open diff --git a/test/keyboard_ui.fl b/test/keyboard_ui.fl index ab96c03c2..aca1002be 100644 --- a/test/keyboard_ui.fl +++ b/test/keyboard_ui.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} Function {make_window()} {open diff --git a/test/mandelbrot_ui.fl b/test/mandelbrot_ui.fl index 61ad2e424..005ac8d5d 100644 --- a/test/mandelbrot_ui.fl +++ b/test/mandelbrot_ui.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} decl {\#include "mandelbrot.h"} {public local diff --git a/test/preferences.fl b/test/preferences.fl index 6189a9769..d63c23313 100644 --- a/test/preferences.fl +++ b/test/preferences.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} decl {\#include <FL/Fl_Preferences.H>} {public local diff --git a/test/radio.fl b/test/radio.fl index dc77dc79c..868edac8c 100644 --- a/test/radio.fl +++ b/test/radio.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} Function {button_cb(Fl_Button *b, void *)} { diff --git a/test/resize.fl b/test/resize.fl index 44f067563..52a867c30 100644 --- a/test/resize.fl +++ b/test/resize.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} Function {} {open diff --git a/test/tabs.fl b/test/tabs.fl index 1c68311f7..2c34965e0 100644 --- a/test/tabs.fl +++ b/test/tabs.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} Function {} {open diff --git a/test/tree.fl b/test/tree.fl index 934b83601..8fb93fb8b 100644 --- a/test/tree.fl +++ b/test/tree.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} decl {\#include <stdio.h>} {public global diff --git a/test/valuators.fl b/test/valuators.fl index c164221fa..5df70e55c 100644 --- a/test/valuators.fl +++ b/test/valuators.fl @@ -1,5 +1,5 @@ # data file for the Fltk User Interface Designer (fluid) -version 1.0304 +version 1.0400 header_name {.h} code_name {.cxx} Function {callback(Fl_Widget* o, void*)} {open private return_type void |