From 473d8af1a465ff9b30570fd9f1ed690a30b5fbb8 Mon Sep 17 00:00:00 2001 From: engelsman Date: Thu, 11 Nov 2010 18:22:43 +0000 Subject: Added mouse!=0 check in Fl_Glut_Window::handle (STR #2381) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7818 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CHANGES | 1 + src/glut_compatability.cxx | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index a76dcd7e3..2c2141438 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,6 @@ CHANGES IN FLTK 1.3.0 + - Added mouse!=0 check in Fl_Glut_Window::handle (STR #2381) - Fixed menu and shortcut handling (STR #2243) - Removed support for gcc 2.x (or older) - Fixed fltk-config to give --libs on one line (STR #2408) diff --git a/src/glut_compatability.cxx b/src/glut_compatability.cxx index 90aa69dc6..332db4463 100644 --- a/src/glut_compatability.cxx +++ b/src/glut_compatability.cxx @@ -3,7 +3,7 @@ // // GLUT emulation routines for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2009 by Bill Spitzak and others. +// Copyright 1998-2010 by Bill Spitzak and others. // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Library General Public @@ -105,8 +105,8 @@ int Fl_Glut_Window::handle(int event) { case FL_MOUSEWHEEL: button = Fl::event_dy(); - while (button < 0) {mouse(3,GLUT_DOWN,ex,ey); ++button;} - while (button > 0) {mouse(4,GLUT_DOWN,ex,ey); --button;} + while (button < 0) {if (mouse) mouse(3,GLUT_DOWN,ex,ey); ++button;} + while (button > 0) {if (mouse) mouse(4,GLUT_DOWN,ex,ey); --button;} return 1; case FL_RELEASE: -- cgit v1.2.3