From cdc15f49a6d491b6a117a98f96e282113ee9cc97 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 27 Jun 2002 20:52:44 +0000 Subject: Fix math header for nocygwin mode. Revert focus check in fl_fix_focus(). Don't click the click count in Fl_Browser_::select(). git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2324 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 4 ++++ FL/math.h | 41 +++++++++++++++++++---------------------- src/Fl.cxx | 10 ++++++---- src/Fl_Browser_.cxx | 5 ++--- 4 files changed, 31 insertions(+), 29 deletions(-) diff --git a/CHANGES b/CHANGES index 4b8a5350e..e7fa59327 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,9 @@ CHANGES IN FLTK 1.1.0 + - A change in fl_fix_focus() broken click-focus in FLWM. + - Cygwin with -mnocygwin didn't like the FL/math.h + header file. + - Fl_Browser_ cleared the click count unnecessarily. - MacOS: Pixmap draw fix, gl_font implemented FL_FOCUS fix, window type fix for modal and nonmodal windows, glut uninitialised 'display' proc fix diff --git a/FL/math.h b/FL/math.h index 069ba5ba4..3d830988d 100644 --- a/FL/math.h +++ b/FL/math.h @@ -1,5 +1,5 @@ // -// "$Id: math.h,v 1.4.2.4.2.1 2002/01/01 15:11:28 easysw Exp $" +// "$Id: math.h,v 1.4.2.4.2.2 2002/06/27 20:52:44 easysw Exp $" // // Math header file for the Fast Light Tool Kit (FLTK). // @@ -24,38 +24,35 @@ // #ifndef fl_math_h -#define fl_math_h +# define fl_math_h -#include +# include -#ifdef WIN32 +# ifdef WIN32 // things missing from : -#define M_PI 3.14159265358979323846 -#define M_PI_2 1.57079632679489661923 -#define M_PI_4 0.78539816339744830962 -#define M_1_PI 0.31830988618379067154 -#define M_2_PI 0.63661977236758134308 -#define M_SQRT2 1.41421356237309504880 -#define M_SQRT1_2 0.70710678118654752440 +# define M_PI 3.14159265358979323846 +# define M_PI_2 1.57079632679489661923 +# define M_PI_4 0.78539816339744830962 +# define M_1_PI 0.31830988618379067154 +# define M_2_PI 0.63661977236758134308 +# define M_SQRT2 1.41421356237309504880 +# define M_SQRT1_2 0.70710678118654752440 -#else +# elif defined(__EMX__) +# include +# endif -#ifdef __EMX__ -#include -#endif - -#endif - -#if defined(WIN32) || defined(CRAY) +# if (defined(WIN32) || defined(CRAY)) && !__MINGW32__ inline double rint(double v) {return floor(v+.5);} inline double copysign(double a, double b) {return b<0 ? -a : a;} -#endif +# endif // (WIN32 || CRAY) && !__MINGW32__ + +#endif // !fl_math_h -#endif // -// End of "$Id: math.h,v 1.4.2.4.2.1 2002/01/01 15:11:28 easysw Exp $". +// End of "$Id: math.h,v 1.4.2.4.2.2 2002/06/27 20:52:44 easysw Exp $". // diff --git a/src/Fl.cxx b/src/Fl.cxx index 5b126c4b5..16690b930 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.41.2.38 2002/06/11 16:17:41 easysw Exp $" +// "$Id: Fl.cxx,v 1.24.2.41.2.39 2002/06/27 20:52:44 easysw Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -467,8 +467,10 @@ void fl_fix_focus() { } else Fl::focus(0); - if (!(Fl::event_state() & 0x7f00000 /*FL_BUTTONS*/)) { - +// MRS: Originally we checked the button state, but a user reported that it +// broke click-to-focus in FLWM?!? +// if (!(Fl::event_state() & 0x7f00000 /*FL_BUTTONS*/)) { + if (!Fl::pushed()) { // set belowmouse based on Fl::modal() and fl_xmousewin: w = fl_xmousewin; if (w) { @@ -931,5 +933,5 @@ void Fl_Window::flush() { } // -// End of "$Id: Fl.cxx,v 1.24.2.41.2.38 2002/06/11 16:17:41 easysw Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.41.2.39 2002/06/27 20:52:44 easysw Exp $". // diff --git a/src/Fl_Browser_.cxx b/src/Fl_Browser_.cxx index 0741ea11e..0215a55d5 100644 --- a/src/Fl_Browser_.cxx +++ b/src/Fl_Browser_.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.11 2002/04/11 10:46:19 easysw Exp $" +// "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.12 2002/06/27 20:52:44 easysw Exp $" // // Base Browser widget class for the Fast Light Tool Kit (FLTK). // @@ -464,7 +464,6 @@ int Fl_Browser_::select(void* l, int i, int docallbacks) { display(l); } } - Fl::event_clicks(0); if (docallbacks) do_callback(); return 1; } @@ -712,5 +711,5 @@ void Fl_Browser_::item_select(void*, int) {} int Fl_Browser_::item_selected(void* l) const {return l==selection_;} // -// End of "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.11 2002/04/11 10:46:19 easysw Exp $". +// End of "$Id: Fl_Browser_.cxx,v 1.10.2.16.2.12 2002/06/27 20:52:44 easysw Exp $". // -- cgit v1.2.3