From 4e6a41e2cdde2531174a59cae28e4eb63c0a75bb Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Tue, 9 Sep 2003 15:15:18 +0000 Subject: [PATCH] Bump to 1.1.5rc1... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3100 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 4 ++++ CREDITS | 2 +- FL/Enumerations.H | 6 +++--- README | 2 +- configure.in | 8 ++++---- documentation/index.html | 4 ++-- documentation/preface.html | 4 ++-- fltk.spec | 6 +++--- fluid/about_panel.cxx | 2 +- fluid/about_panel.fl | 2 +- 10 files changed, 22 insertions(+), 18 deletions(-) diff --git a/CHANGES b/CHANGES index 5f84f6949..75062268e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +CHANGES IN FLTK 1.1.5rc1 + + + CHANGES IN FLTK 1.1.4 - The fl_read_image() function was not implemented on diff --git a/CREDITS b/CREDITS index 95c54b453..b8aac7caa 100644 --- a/CREDITS +++ b/CREDITS @@ -1,4 +1,4 @@ -CREDITS - Fast Light Tool Kit (FLTK) Version 1.1.4 +CREDITS - Fast Light Tool Kit (FLTK) Version 1.1.5 -------------------------------------------------- This file lists the people responsible for the toolkit you diff --git a/FL/Enumerations.H b/FL/Enumerations.H index 5bfe44c24..cba5c88e5 100644 --- a/FL/Enumerations.H +++ b/FL/Enumerations.H @@ -1,5 +1,5 @@ // -// "$Id: Enumerations.H,v 1.18.2.14.2.35 2003/06/12 01:36:15 easysw Exp $" +// "$Id: Enumerations.H,v 1.18.2.14.2.36 2003/09/09 15:15:17 easysw Exp $" // // Enumerations for the Fast Light Tool Kit (FLTK). // @@ -45,7 +45,7 @@ #define FL_MAJOR_VERSION 1 #define FL_MINOR_VERSION 1 -#define FL_PATCH_VERSION 4 +#define FL_PATCH_VERSION 5 #define FL_VERSION ((double)FL_MAJOR_VERSION + \ (double)FL_MINOR_VERSION * 0.01 + \ (double)FL_PATCH_VERSION * 0.0001) @@ -419,5 +419,5 @@ enum Fl_Damage { #endif // -// End of "$Id: Enumerations.H,v 1.18.2.14.2.35 2003/06/12 01:36:15 easysw Exp $". +// End of "$Id: Enumerations.H,v 1.18.2.14.2.36 2003/09/09 15:15:17 easysw Exp $". // diff --git a/README b/README index 22e19beaa..5ad4151b8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README - Fast Light Tool Kit (FLTK) Version 1.1.4 +README - Fast Light Tool Kit (FLTK) Version 1.1.5 ------------------------------------------------- WHAT IS FLTK? diff --git a/configure.in b/configure.in index 853c8bef9..17d469d66 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl -*- sh -*- dnl the "configure" script is made from this by running GNU "autoconf" dnl -dnl "$Id: configure.in,v 1.33.2.31.2.104 2003/08/05 22:40:45 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.105 2003/09/09 15:15:16 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -34,8 +34,8 @@ AC_INIT(src/Fl.cxx) dnl FLTK library versions... FL_MAJOR_VERSION=1 FL_MINOR_VERSION=1 -FL_PATCH_VERSION=4 -FL_RELEASE_VERSION= +FL_PATCH_VERSION=5 +FL_RELEASE_VERSION=rc1 FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} AC_SUBST(FL_MAJOR_VERSION) @@ -852,5 +852,5 @@ dnl Make sure the fltk-config script is executable... chmod +x fltk-config dnl -dnl End of "$Id: configure.in,v 1.33.2.31.2.104 2003/08/05 22:40:45 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.105 2003/09/09 15:15:16 easysw Exp $". dnl diff --git a/documentation/index.html b/documentation/index.html index 2a0f78a13..0749c14ae 100644 --- a/documentation/index.html +++ b/documentation/index.html @@ -1,7 +1,7 @@ - FLTK 1.1.4 Programming Manual + FLTK 1.1.5 Programming Manual @@ -10,7 +10,7 @@ FL -

FLTK 1.1.4 Programming Manual

+

FLTK 1.1.5 Programming Manual

Revision 4 by Michael Sweet, Craig P. Earls, and Bill Spitzak
Copyright 1998-2003 by Bill Spitzak and others.

diff --git a/documentation/preface.html b/documentation/preface.html index 943df707d..869a19be6 100644 --- a/documentation/preface.html +++ b/documentation/preface.html @@ -3,14 +3,14 @@ - FLTK 1.1.4 Programming Manual + FLTK 1.1.5 Programming Manual

Preface

This manual describes the Fast Light Tool Kit ("FLTK") -version 1.1.4, a C++ Graphical User Interface +version 1.1.5, a C++ Graphical User Interface ("GUI") toolkit for UNIX, Microsoft Windows and MacOS. 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/fltk.spec b/fltk.spec index 40e558ec0..fcbcb8017 100644 --- a/fltk.spec +++ b/fltk.spec @@ -1,5 +1,5 @@ # -# "$Id: fltk.spec,v 1.1.2.9.2.26 2003/08/02 21:17:30 easysw Exp $" +# "$Id: fltk.spec,v 1.1.2.9.2.27 2003/09/09 15:15:17 easysw Exp $" # # RPM spec file for FLTK. # @@ -23,7 +23,7 @@ # Please report all bugs and problems to "fltk-bugs@fltk.org". # -%define version 1.1.4 +%define version 1.1.5rc1 %define release 0 %define prefix /usr @@ -96,5 +96,5 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/share/doc/fltk/* # -# End of "$Id: fltk.spec,v 1.1.2.9.2.26 2003/08/02 21:17:30 easysw Exp $". +# End of "$Id: fltk.spec,v 1.1.2.9.2.27 2003/09/09 15:15:17 easysw Exp $". # diff --git a/fluid/about_panel.cxx b/fluid/about_panel.cxx index dab4ba5b9..8c8055852 100644 --- a/fluid/about_panel.cxx +++ b/fluid/about_panel.cxx @@ -85,7 +85,7 @@ Fl_Window* make_about_panel() { o->labelcolor(7); o->align(FL_ALIGN_TOP|FL_ALIGN_INSIDE); } - { Fl_Box* o = new Fl_Box(140, 27, 160, 123, "FLTK User\nInterface\nDesigner\nVersion 1.1.4"); + { Fl_Box* o = new Fl_Box(140, 27, 160, 123, "FLTK User\nInterface\nDesigner\nVersion 1.1.5"); o->box(FL_OVAL_BOX); o->color(12); o->selection_color(47); diff --git a/fluid/about_panel.fl b/fluid/about_panel.fl index f2f231d7b..b20b5753a 100644 --- a/fluid/about_panel.fl +++ b/fluid/about_panel.fl @@ -49,7 +49,7 @@ Function {make_about_panel()} {open label {FLTK User Interface Designer -Version 1.1.4} +Version 1.1.5} xywh {140 27 160 123} box OVAL_BOX color 12 selection_color 47 labeltype SHADOW_LABEL labelfont 1 labelsize 18 labelcolor 7 } Fl_Button {} {