Author: matt
Date: 2010-11-15 11:43:34 -0800 (Mon, 15 Nov 2010)
New Revision: 7846
Log:
Fixed mouse wheel related crash in GLUT emulation (STR #2381)

Modified:
   branches/branch-1.1/CHANGES
   branches/branch-1.1/src/glut_compatability.cxx

Modified: branches/branch-1.1/CHANGES
===================================================================
--- branches/branch-1.1/CHANGES 2010-11-15 19:08:05 UTC (rev 7845)
+++ branches/branch-1.1/CHANGES 2010-11-15 19:43:34 UTC (rev 7846)
@@ -1,3 +1,8 @@
+CHANGES IN FLTK 1.1.11
+
+       - Documentation fixes (STR #2410)
+       - Fixed mouse wheel related crash in GLUT emulation (STR #2381)
+
 CHANGES IN FLTK 1.1.10
 
        - Documentation fixes (STR #2220, STR #2209, STR #1945, STR #1893)

Modified: branches/branch-1.1/src/glut_compatability.cxx
===================================================================
--- branches/branch-1.1/src/glut_compatability.cxx      2010-11-15 19:08:05 UTC 
(rev 7845)
+++ branches/branch-1.1/src/glut_compatability.cxx      2010-11-15 19:43:34 UTC 
(rev 7846)
@@ -103,8 +103,8 @@
 
   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:

_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit

Reply via email to