Author: AlbrechtS
Date: 2009-09-13 15:02:30 -0700 (Sun, 13 Sep 2009)
New Revision: 6870
Log:
Fixed X server "lock", if a modal dialog window is opened while a menu
is active (STR #1986).
This is only an intermediate fix. The full fix should dismiss the menu
when the mouse is clicked outside the menu area.
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 2009-09-13 21:57:46 UTC (rev 6869)
+++ branches/branch-1.1/CHANGES 2009-09-13 22:02:30 UTC (rev 6870)
@@ -1,5 +1,7 @@
CHANGES IN FLTK 1.1.10
+ - Fixed X server "lock", if a modal dialog window is opened
+ while a menu is active (STR #1986)
- Updated mirror sites in documentation (STR #2220)
- Setting a default font for Xft (STR #2216)
- Temporarily limited builds to 32-bit on OX S to stay
Modified: branches/branch-1.1/src/fl_ask.cxx
===================================================================
--- branches/branch-1.1/src/fl_ask.cxx 2009-09-13 21:57:46 UTC (rev 6869)
+++ branches/branch-1.1/src/fl_ask.cxx 2009-09-13 22:02:30 UTC (rev 6870)
@@ -216,8 +216,7 @@
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);
+ if (g) Fl::grab(0);
int r = 0;
for (;;) {
Fl_Widget *o = Fl::readqueue();
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
