diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-12 20:45:28 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-08-12 20:45:28 +0000 |
| commit | 5ecf5cde986ddfff540e33008bdc4d0803ba56a7 (patch) | |
| tree | f985917ad84ba96ce83651804e865d40c96c685e /src/Fl.cxx | |
| parent | c6b1b2c7b6b583dfed45fcbbe833ace429897b52 (diff) | |
Fix modal() handling of FL_RELEASE events.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2578 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl.cxx')
| -rw-r--r-- | src/Fl.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
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 $". // |