Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-07 00:55:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed menu problem - FL_MOVE/DRAG processing stopped before sending the

Browse Source 
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
This commit is contained in:
Michael R Sweet
2002-05-15 23:12:30 +00:00
parent 8b6acd43eb
commit 1f39ef0323
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl.cxx
+2 -3
View File
@@ -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 $".
//
src/Fl_Menu.cxx
+3 -3
View File
@@ -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 $".
//