Author: manolo
Date: 2011-05-07 00:15:39 -0700 (Sat, 07 May 2011)
New Revision: 8641
Log:
Fix STR #2619. An extra FL_MOVE event is sent on X11 after the menu item is
selected
by the keyboard.
Modified:
branches/branch-1.3/src/Fl_Menu.cxx
Modified: branches/branch-1.3/src/Fl_Menu.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Menu.cxx 2011-05-06 18:15:29 UTC (rev 8640)
+++ branches/branch-1.3/src/Fl_Menu.cxx 2011-05-07 07:15:39 UTC (rev 8641)
@@ -612,7 +612,7 @@
static int forward(int menu) { // go to next item in menu menu if possible
menustate &pp = *p;
- // Fl_Menu_Button can geberate menu=-1. This line fixes it and selectes the
first item.
+ // Fl_Menu_Button can generate menu=-1. This line fixes it and selectes the
first item.
if (menu==-1)
menu = 0;
menuwindow &m = *(pp.p[menu]);
@@ -729,16 +729,17 @@
}
}
break;
+ case FL_MOVE:
+#if ! (defined(WIN32) || defined(__APPLE__))
+ if (pp.state == DONE_STATE) {
+ return 1; // Fix for STR #2619
+ }
+ /* FALLTHROUGH */
+#endif
case FL_ENTER:
- case FL_MOVE:
case FL_PUSH:
case FL_DRAG:
{
-#ifdef __QNX__
- // STR 704: workaround QNX X11 bug - in QNX a FL_MOVE event is sent
- // right after FL_RELEASE...
- if (pp.state == DONE_STATE) return 1;
-#endif // __QNX__
int mx = Fl::event_x_root();
int my = Fl::event_y_root();
int item=0; int mymenu = pp.nummenus-1;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
