diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-08-02 12:38:10 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2003-08-02 12:38:10 +0000 |
| commit | afbeea5714673d1872bcf6949c0df714a3770478 (patch) | |
| tree | 71d14a933767d2b3534b353d01bda9625124a8b0 | |
| parent | c2e889169308b826f68becc4c2c14ede857689c3 (diff) | |
Bump to 1.1.4 and fix changelog.
#ifdef in fluid was wrong - didn't use piping on OSX when not compiling
against Metroworks compiler.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3068 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 12 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | fltk.spec | 6 | ||||
| -rw-r--r-- | fluid/fluid.cxx | 8 |
4 files changed, 18 insertions, 14 deletions
@@ -1,10 +1,14 @@ -CHANGES IN FLTK 1.1.4rc2 +CHANGES IN FLTK 1.1.4 - - OS X: some changes to make ProjectBuilder compiles - possible. I'll add the PB project files later. - - OS X: FLTK would not know where a window was positioned + - OSX: some changes to make ProjectBuilder compiles + possible. + - OSX: FLTK would not know where a window was positioned by the OS. As a result, popup menus could open at wrong positions. + + +CHANGES IN FLTK 1.1.4rc2 + - Fl_Window::show(argc,argv) incorrectly opened the display prior to parsing the arguments; this prevented the "-display foo" option from working (STR #111) diff --git a/configure.in b/configure.in index cef47d2d5..756a69fee 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.102 2003/07/29 02:12:36 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.103 2003/08/02 12:38:09 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -35,7 +35,7 @@ dnl FLTK library versions... FL_MAJOR_VERSION=1 FL_MINOR_VERSION=1 FL_PATCH_VERSION=4 -FL_RELEASE_VERSION=rc2 +FL_RELEASE_VERSION= 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.102 2003/07/29 02:12:36 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.103 2003/08/02 12:38:09 easysw Exp $". dnl @@ -1,5 +1,5 @@ # -# "$Id: fltk.spec,v 1.1.2.9.2.24 2003/07/29 02:12:36 easysw Exp $" +# "$Id: fltk.spec,v 1.1.2.9.2.25 2003/08/02 12:38:10 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.4rc2 +%define version 1.1.4 %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.24 2003/07/29 02:12:36 easysw Exp $". +# End of "$Id: fltk.spec,v 1.1.2.9.2.25 2003/08/02 12:38:10 easysw Exp $". # diff --git a/fluid/fluid.cxx b/fluid/fluid.cxx index 634964bef..eb3dfb33d 100644 --- a/fluid/fluid.cxx +++ b/fluid/fluid.cxx @@ -1,5 +1,5 @@ // -// "$Id: fluid.cxx,v 1.15.2.13.2.41 2003/08/02 05:54:43 matthiaswm Exp $" +// "$Id: fluid.cxx,v 1.15.2.13.2.42 2003/08/02 12:38:10 easysw Exp $" // // FLUID main entry for the Fast Light Tool Kit (FLTK). // @@ -650,7 +650,7 @@ void update_history(const char *flname) { } // Shell command support... -#if ( !defined(WIN32) || defined(__CYGWIN__) ) && ( !defined(__MWERKS__) && !defined(__APPLE__) ) +#if (!defined(WIN32) || defined(__CYGWIN__)) && !defined(__MWERKS__) // Support the full piped shell command... static FILE *shell_pipe = 0; @@ -769,7 +769,7 @@ do_shell_command(Fl_Return_Button*, void*) { fl_message("Shell command completed successfully!"); } } -#endif // !WIN32 || __CYGWIN__ +#endif // (!WIN32 || __CYGWIN__) && !__MWERKS__ void @@ -886,5 +886,5 @@ int main(int argc,char **argv) { } // -// End of "$Id: fluid.cxx,v 1.15.2.13.2.41 2003/08/02 05:54:43 matthiaswm Exp $". +// End of "$Id: fluid.cxx,v 1.15.2.13.2.42 2003/08/02 12:38:10 easysw Exp $". // |