From e7b04a53ac790ad6fda6b05a2eb0a71b2a2d0818 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 21 Jan 1999 05:59:04 +0000 Subject: [PATCH] Default handling for drops should be keyed on GTK_DRAG_DEFAULT_DROP not Thu Jan 21 00:44:47 1999 Owen Taylor * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling for drops should be keyed on GTK_DRAG_DEFAULT_DROP not GTK_DRAG_DEFAULT_MOTION. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkdnd.c | 4 ++-- 8 files changed, 44 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 33422ec62b..8af850f9a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jan 21 00:44:47 1999 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling + for drops should be keyed on GTK_DRAG_DEFAULT_DROP + not GTK_DRAG_DEFAULT_MOTION. + Wed Jan 20 21:52:51 1999 Jeff Garzik * gtk/gtkclist.c (real_remove_row): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 33422ec62b..8af850f9a3 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Thu Jan 21 00:44:47 1999 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling + for drops should be keyed on GTK_DRAG_DEFAULT_DROP + not GTK_DRAG_DEFAULT_MOTION. + Wed Jan 20 21:52:51 1999 Jeff Garzik * gtk/gtkclist.c (real_remove_row): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 33422ec62b..8af850f9a3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Jan 21 00:44:47 1999 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling + for drops should be keyed on GTK_DRAG_DEFAULT_DROP + not GTK_DRAG_DEFAULT_MOTION. + Wed Jan 20 21:52:51 1999 Jeff Garzik * gtk/gtkclist.c (real_remove_row): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 33422ec62b..8af850f9a3 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Thu Jan 21 00:44:47 1999 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling + for drops should be keyed on GTK_DRAG_DEFAULT_DROP + not GTK_DRAG_DEFAULT_MOTION. + Wed Jan 20 21:52:51 1999 Jeff Garzik * gtk/gtkclist.c (real_remove_row): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 33422ec62b..8af850f9a3 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Thu Jan 21 00:44:47 1999 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling + for drops should be keyed on GTK_DRAG_DEFAULT_DROP + not GTK_DRAG_DEFAULT_MOTION. + Wed Jan 20 21:52:51 1999 Jeff Garzik * gtk/gtkclist.c (real_remove_row): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 33422ec62b..8af850f9a3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Thu Jan 21 00:44:47 1999 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling + for drops should be keyed on GTK_DRAG_DEFAULT_DROP + not GTK_DRAG_DEFAULT_MOTION. + Wed Jan 20 21:52:51 1999 Jeff Garzik * gtk/gtkclist.c (real_remove_row): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 33422ec62b..8af850f9a3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Thu Jan 21 00:44:47 1999 Owen Taylor + + * gtk/gtkdnd.c (gtk_drag_dest_drop): Default handling + for drops should be keyed on GTK_DRAG_DEFAULT_DROP + not GTK_DRAG_DEFAULT_MOTION. + Wed Jan 20 21:52:51 1999 Jeff Garzik * gtk/gtkclist.c (real_remove_row): diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 7ece58b27b..475253aaf2 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -1428,7 +1428,7 @@ gtk_drag_dest_drop (GtkWidget *widget, { gboolean retval; - if (site->flags & GTK_DEST_DEFAULT_MOTION) + if (site->flags & GTK_DEST_DEFAULT_DROP) { GdkAtom target = gtk_drag_dest_find_target (widget, site, context); @@ -1441,7 +1441,7 @@ gtk_drag_dest_drop (GtkWidget *widget, gtk_signal_emit_by_name (GTK_OBJECT (widget), "drag_drop", context, x, y, time, &retval); - return (site->flags & GTK_DEST_DEFAULT_MOTION) ? TRUE : retval; + return (site->flags & GTK_DEST_DEFAULT_DROP) ? TRUE : retval; } }