Author: matt
Date: 2008-02-20 10:33:25 -0800 (Wed, 20 Feb 2008)
New Revision: 6035
Log:
STR 1869: fixed race condition when an alert window pops up during menu
handling.
Modified:
branches/branch-1.1/CHANGES
branches/branch-1.1/src/fl_ask.cxx
Modified: branches/branch-1.1/CHANGES
===================================================================
--- branches/branch-1.1/CHANGES 2008-02-20 18:23:56 UTC (rev 6034)
+++ branches/branch-1.1/CHANGES 2008-02-20 18:33:25 UTC (rev 6035)
@@ -6,6 +6,8 @@
STR #1742, STR #1777, STR #1794, STR #1827, STR #1843,
STR #1796, STR #1815, STR #1726, STR #1753, STR #1855,
STR #1862, STR #1867, STR #1874)
+ - Fixed lockout when mixing popups and alerts
+ (STR # 1869)
- Fixed recursion crash in event handling (STR #1873)
- Fixed missing return coe in 'fltk-config' (STR #1875)
- Fixed inconsistencies with CHANGED flags (STR #1719)
Modified: branches/branch-1.1/src/fl_ask.cxx
===================================================================
--- branches/branch-1.1/src/fl_ask.cxx 2008-02-20 18:23:56 UTC (rev 6034)
+++ branches/branch-1.1/src/fl_ask.cxx 2008-02-20 18:33:25 UTC (rev 6035)
@@ -208,6 +208,10 @@
button[0]->shortcut(FL_Escape);
message_form->show();
+ // deactivate Fl::grab(), because it is incompatible with Fl::readqueue()
+ Fl_Window* g = Fl::grab();
+ if (g) // do an alternative grab to avoid floating menus, if possible
+ Fl::grab(message_form);
int r;
for (;;) {
Fl_Widget *o = Fl::readqueue();
@@ -217,6 +221,8 @@
else if (o == button[2]) {r = 2; break;}
else if (o == message_form) {r = 0; break;}
}
+ if (g) // regrab the previous popup menu, if there was one
+ Fl::grab(g);
message_form->hide();
icon->label(prev_icon_label);
return r;
_______________________________________________
fltk-commit mailing list
fltk-commit@easysw.com
http://lists.easysw.com/mailman/listinfo/fltk-commit
