summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2010-11-30 14:06:15 +0000
committerManolo Gouy <Manolo>2010-11-30 14:06:15 +0000
commitd2334f610eec4475d975d68df2544a2715ed4497 (patch)
tree6f37a951cb0e8922c2f26fd9903ea330887f71a3
parent1303ce45976d42f3ef289f5419451b8e7f865f2b (diff)
Fixes STR #2461. Also, the drag'n-drop X11 cursor has been set to FL_CURSOR_MOVE.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7923 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_Input.cxx3
-rw-r--r--src/fl_dnd_x.cxx2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx
index 081ddaf1b..0a94c872c 100644
--- a/src/Fl_Input.cxx
+++ b/src/Fl_Input.cxx
@@ -626,6 +626,9 @@ int Fl_Input::handle(int event) {
Fl::focus(dnd_save_focus);
handle(FL_UNFOCUS);
}
+#if !(defined(__APPLE__) || defined(WIN32))
+ Fl::first_window()->cursor(FL_CURSOR_MOVE);
+#endif
return 1;
case FL_DND_RELEASE:
diff --git a/src/fl_dnd_x.cxx b/src/fl_dnd_x.cxx
index 929ca9561..403793965 100644
--- a/src/fl_dnd_x.cxx
+++ b/src/fl_dnd_x.cxx
@@ -87,7 +87,7 @@ static int local_handle(int event, Fl_Window* window) {
int Fl::dnd() {
Fl_Window *source_fl_win = Fl::first_window();
- Fl::first_window()->cursor((Fl_Cursor)21);
+ Fl::first_window()->cursor(FL_CURSOR_MOVE);
Window source_window = fl_xid(Fl::first_window());
fl_local_grab = grabfunc;
Window target_window = 0;