diff options
| author | Bill Spitzak <spitzak@gmail.com> | 2002-05-16 07:43:59 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 2002-05-16 07:43:59 +0000 |
| commit | 8fd4b107da21c3e9a89bb9e81b2a61eb2bd0f3dd (patch) | |
| tree | dd1f4defd3b2dc74afd8c36efdf57d9882fd34ec /src | |
| parent | af1ec00483000fe92ad902a599779863f42b1e17 (diff) | |
Slight change to menu fix so that events only go to the grab() widget.
Changed Win32 dnd slightly so a [+] cursor is used instead of the link one.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2235 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_Menu.cxx | 7 | ||||
| -rw-r--r-- | src/fl_dnd_win32.cxx | 6 |
3 files changed, 11 insertions, 8 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index 2cd6c99f2..6c2dc96a7 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.41.2.31 2002/05/15 23:12:30 easysw Exp $" +// "$Id: Fl.cxx,v 1.24.2.41.2.32 2002/05/16 07:43:59 spitzak Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -584,7 +584,9 @@ int Fl::handle(int event, Fl_Window* window) fl_xmousewin = window; // this should already be set, but just in case. if (pushed()) { w = pushed(); + if (grab()) w = grab(); e_number = event = FL_DRAG; + break; } if (modal() && w != modal()) w = 0; if (grab()) w = grab(); @@ -898,5 +900,5 @@ void Fl_Window::flush() { } // -// End of "$Id: Fl.cxx,v 1.24.2.41.2.31 2002/05/15 23:12:30 easysw Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.41.2.32 2002/05/16 07:43:59 spitzak Exp $". // diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx index 6c66f6556..67bedd0e2 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.13 2002/05/15 23:12:30 easysw Exp $" +// "$Id: Fl_Menu.cxx,v 1.18.2.12.2.14 2002/05/16 07:43:59 spitzak Exp $" // // Menu code for the Fast Light Tool Kit (FLTK). // @@ -538,8 +538,9 @@ int menuwindow::handle(int e) { return 1; } }} break; - case FL_PUSH: + case FL_ENTER: case FL_MOVE: + case FL_PUSH: case FL_DRAG: { int mx = Fl::event_x_root(); int my = Fl::event_y_root(); @@ -775,5 +776,5 @@ const Fl_Menu_Item* Fl_Menu_Item::test_shortcut() const { } // -// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.13 2002/05/15 23:12:30 easysw Exp $". +// End of "$Id: Fl_Menu.cxx,v 1.18.2.12.2.14 2002/05/16 07:43:59 spitzak Exp $". // diff --git a/src/fl_dnd_win32.cxx b/src/fl_dnd_win32.cxx index e4bfa50f4..296e460c9 100644 --- a/src/fl_dnd_win32.cxx +++ b/src/fl_dnd_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: fl_dnd_win32.cxx,v 1.5.2.8 2002/05/01 20:05:19 easysw Exp $" +// "$Id: fl_dnd_win32.cxx,v 1.5.2.9 2002/05/16 07:43:59 spitzak Exp $" // // Drag & Drop code for the Fast Light Tool Kit (FLTK). // @@ -127,7 +127,7 @@ public: } // Fl_Group will change DND_DRAG into DND_ENTER and DND_LEAVE if needed if ( Fl::handle( FL_DND_DRAG, fl_dnd_target_window ) ) - *pdwEffect = DROPEFFECT_MOVE|DROPEFFECT_COPY|DROPEFFECT_LINK; + *pdwEffect = DROPEFFECT_MOVE|DROPEFFECT_COPY; //|DROPEFFECT_LINK; else *pdwEffect = DROPEFFECT_NONE; px = pt.x; py = pt.y; @@ -351,5 +351,5 @@ int Fl::dnd() // -// End of "$Id: fl_dnd_win32.cxx,v 1.5.2.8 2002/05/01 20:05:19 easysw Exp $". +// End of "$Id: fl_dnd_win32.cxx,v 1.5.2.9 2002/05/16 07:43:59 spitzak Exp $". // |