summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2014-06-01 17:21:37 +0000
committerManolo Gouy <Manolo>2014-06-01 17:21:37 +0000
commite3959bbaff421ed4ad848e61e82e9cf7e2dda17c (patch)
treeceac909931717deaee34c370fe442f911a321e42
parent9b79cb89f7f85a49d564da9b3b094c4e37c279f6 (diff)
Fixed D&D to FLTK broken by recent commits.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10181 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_x.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index f2be54814..d86596a1d 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -1339,7 +1339,7 @@ int fl_handle(const XEvent& thisevent)
if (XGetWindowProperty(fl_display,
fl_xevent->xselection.requestor,
fl_xevent->xselection.property,
- bytesread/4, 65536, 0/*1*/, AnyPropertyType,
+ bytesread/4, 65536, 1, AnyPropertyType,
&actual, &format, &count, &remaining,
&portion)) break; // quit on error
@@ -1356,7 +1356,6 @@ int fl_handle(const XEvent& thisevent)
return true;
}
- Fl::e_clipboard_type = Fl::clipboard_plain_text; // default data type
if (actual == TARGETS || actual == XA_ATOM) {
/*for (unsigned i = 0; i<count; i++) {
fprintf(stderr," %s", XGetAtomName(fl_display, ((Atom*)portion)[i]) );
@@ -1677,6 +1676,7 @@ fprintf(stderr,"\n");*/
Fl::e_length = unknown_len;
if (Fl::handle(FL_DND_RELEASE, window)) {
fl_selection_requestor = Fl::belowmouse();
+ Fl::e_clipboard_type = Fl::clipboard_plain_text;
XConvertSelection(fl_display, fl_XdndSelection,
fl_dnd_type, XA_SECONDARY,
to_window, fl_event_time);