diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | src/Fl.cxx | 8 |
2 files changed, 7 insertions, 4 deletions
@@ -1,6 +1,9 @@ CHANGES IN FLTK 1.1.0rc6 - Documentation updates. + - Fl::handle() didn't apply the modal tests for + FL_RELEASE events, which caused Fl_Tabs to allow users + to change tabs even when a modal window was open. - Fl_Input_ now draws the box function to erase the background. This fixes redraw problems noticed with the plastic scheme. diff --git a/src/Fl.cxx b/src/Fl.cxx index d8c2a749e..99d6f041c 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.41.2.45 2002/08/12 19:30:44 easysw Exp $" +// "$Id: Fl.cxx,v 1.24.2.41.2.46 2002/08/12 20:45:28 easysw Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -617,8 +617,8 @@ int Fl::handle(int e, Fl_Window* window) if (pushed()) { wi = pushed(); pushed_ = 0; // must be zero before callback is done! - } - if (grab()) wi = grab(); + } else if (grab()) wi = grab(); + else if (modal() && wi != modal()) return 0; int r = send(e, wi, window); fl_fix_focus(); return r;} @@ -949,5 +949,5 @@ void Fl_Window::flush() { } // -// End of "$Id: Fl.cxx,v 1.24.2.41.2.45 2002/08/12 19:30:44 easysw Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.41.2.46 2002/08/12 20:45:28 easysw Exp $". // |