From 70ca1d156ba8bb0aa1b3a925b89f935fe4dccfbe Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 11 Mar 2004 05:17:12 +0000 Subject: Fl_Value_Slider::draw_bg() didn't always apply the clipping rectangle (STR #235) fl_filename_relative() returned the wrong string if the absolute pathname was equal to the current working directory (STR #224) Fl_Help_Dialog didn't correctly restore the scroll position when going forward/back in the link history if the file changed (STR #218) glutGetModifiers() did not mask off extra state bits, confusing some GLUT-based applications (STR #213) Fixed mouse capture problems on MacOS X (STR #209, STR #229) Fl_Sys_Menu_Bar is now built into the library for MacOS X (STR #229) Fl_Menu_ now provides item_pathname() methods to get the "pathname" of a menu item, e.g. "File/Quit" (STR #283) Fl_Text_Display now provides cursor_color() methods to get and set the cursor color (STR #271) Fl_Scroll didn't honor FL_NO_BOX (STR #305) FLUID declaration blocks didn't support public/private definitions (STR #301) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3231 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/glut.H | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'FL/glut.H') diff --git a/FL/glut.H b/FL/glut.H index 9053f8933..25c117c52 100644 --- a/FL/glut.H +++ b/FL/glut.H @@ -1,5 +1,5 @@ // -// "$Id: glut.H,v 1.6.2.10.2.5 2003/01/30 21:40:50 easysw Exp $" +// "$Id: glut.H,v 1.6.2.10.2.6 2004/03/11 05:17:11 easysw Exp $" // // GLUT emulation header file for the Fast Light Tool Kit (FLTK). // @@ -367,11 +367,11 @@ enum { //#define GLUT_NUM_DIALS 608 //#define GLUT_NUM_TABLET_BUTTONS 609 -inline int glutGetModifiers() {return Fl::event_state();} // WARNING: these values are different than GLUT uses: # define GLUT_ACTIVE_SHIFT FL_SHIFT # define GLUT_ACTIVE_CTRL FL_CTRL # define GLUT_ACTIVE_ALT FL_ALT +inline int glutGetModifiers() {return Fl::event_state() & (GLUT_ACTIVE_SHIFT | GLUT_ACTIVE_CTRL | GLUT_ACTIVE_ALT);} int glutLayerGet(GLenum); # define GLUT_OVERLAY_POSSIBLE 800 @@ -470,5 +470,5 @@ extern void APIENTRY glutSolidIcosahedron(); #endif /* !__glut_h__ */ // -// End of "$Id: glut.H,v 1.6.2.10.2.5 2003/01/30 21:40:50 easysw Exp $". +// End of "$Id: glut.H,v 1.6.2.10.2.6 2004/03/11 05:17:11 easysw Exp $". // -- cgit v1.2.3