Author: manolo
Date: 2012-05-16 14:02:12 -0700 (Wed, 16 May 2012)
New Revision: 9507
Log:
Fixed Fl::event_x() and event_y() when fltk3::e_widget is null.
Modified:
branches/branch-3.0/include/FL/Fl.H
Modified: branches/branch-3.0/include/FL/Fl.H
===================================================================
--- branches/branch-3.0/include/FL/Fl.H 2012-05-16 20:50:01 UTC (rev 9506)
+++ branches/branch-3.0/include/FL/Fl.H 2012-05-16 21:02:12 UTC (rev 9507)
@@ -300,11 +300,15 @@
}
static int event_x() {
- return fltk3::event_x() +
(fltk3::e_widget->as_window()?0:fltk3::e_widget->dx_window());
+ int retval = fltk3::event_x();
+ if (fltk3::e_widget && !fltk3::e_widget->as_window()) retval +=
fltk3::e_widget->dx_window();
+ return retval;
}
static int event_y() {
- return fltk3::event_y() +
(fltk3::e_widget->as_window()?0:fltk3::e_widget->dy_window());
+ int retval = fltk3::event_y();
+ if (fltk3::e_widget && !fltk3::e_widget->as_window()) retval +=
fltk3::e_widget->dy_window();
+ return retval;
}
static int event_x_root() {
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
