diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-15 23:12:30 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-05-15 23:12:30 +0000 |
| commit | 1f39ef03234c876f8d77353883664eca6b0ceee0 (patch) | |
| tree | 3e83ff8ecfce2475ef62e96ebe8d018d5b5da70d /src | |
| parent | 8b6acd43eb29f30340cb6cb61fc5052ea2d6d523 (diff) | |
Fixed menu problem - FL_MOVE/DRAG processing stopped before sending the
events when pushed() was set...
Also allow FL_MOVE and FL_DRAG in menu handler()...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2230 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl.cxx | 5 | ||||
| -rw-r--r-- | src/Fl_Menu.cxx | 6 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index e2d34b307..2cd6c99f2 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.41.2.30 2002/05/15 16:37:06 spitzak Exp $" +// "$Id: Fl.cxx,v 1.24.2.41.2.31 2002/05/15 23:12:30 easysw Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -585,7 +585,6 @@ int Fl::handle(int event, Fl_Window* window) if (pushed()) { w = pushed(); e_number = event = FL_DRAG; - break; } if (modal() && w != modal()) w = 0; if (grab()) w = grab(); @@ -899,5 +898,5 @@ void Fl_Window::flush() { } // -// End of "$Id: Fl.cxx,v 1.24.2.41.2.30 2002/05/15 16:37:06 spitzak Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.41.2.31 2002/05/15 23:12:30 easysw Exp $". // diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 9455fdb84..6c66f6556 100644 --- a/src/Fl_Menu.cxx +++ b/src/Fl_Menu.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.12 2002/05/03 14:59:31 easysw Exp $" +// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.13 2002/05/15 23:12:30 easysw Exp $" // // Menu code for the Fast Light Tool Kit (FLTK). // @@ -539,7 +539,7 @@ int menuwindow::handle(int e) { } }} break; case FL_PUSH: - //case FL_MOVE: + case FL_MOVE: case FL_DRAG: { int mx = Fl::event_x_root(); int my = Fl::event_y_root(); @@ -775,5 +775,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.12 2002/05/03 14:59:31 easysw Exp $". +// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.13 2002/05/15 23:12:30 easysw Exp $". // |