From 75f85f940e215fc8ba9c8dc4cc926356e09fc252 Mon Sep 17 00:00:00 2001 From: Paolo Molaro Date: Tue, 20 Oct 1998 09:54:57 +0000 Subject: [PATCH] Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++. --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkdnd.c | 6 +++--- gtk/gtkdnd.h | 2 +- 9 files changed, 32 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dee018fe53..c5ffa50a62 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro + + * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++. + Mon Oct 19 23:44:41 1998 Lars Hamann * gtk/gtkclist.c: rearranged some functions diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index dee018fe53..c5ffa50a62 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro + + * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++. + Mon Oct 19 23:44:41 1998 Lars Hamann * gtk/gtkclist.c: rearranged some functions diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index dee018fe53..c5ffa50a62 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro + + * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++. + Mon Oct 19 23:44:41 1998 Lars Hamann * gtk/gtkclist.c: rearranged some functions diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index dee018fe53..c5ffa50a62 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro + + * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++. + Mon Oct 19 23:44:41 1998 Lars Hamann * gtk/gtkclist.c: rearranged some functions diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index dee018fe53..c5ffa50a62 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro + + * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++. + Mon Oct 19 23:44:41 1998 Lars Hamann * gtk/gtkclist.c: rearranged some functions diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index dee018fe53..c5ffa50a62 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro + + * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++. + Mon Oct 19 23:44:41 1998 Lars Hamann * gtk/gtkclist.c: rearranged some functions diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index dee018fe53..c5ffa50a62 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Tue, 20 Oct 1998 11:33:10 +0200 Paolo Molaro + + * gtk/gtkdnd.h,gtk/gtkdnd.c: delete is a reserved word in c++. + Mon Oct 19 23:44:41 1998 Lars Hamann * gtk/gtkclist.c: rearranged some functions diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 5237870d0d..f3d1d07d29 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -538,14 +538,14 @@ gtk_drag_get_data (GtkWidget *widget, void gtk_drag_finish (GdkDragContext *context, gboolean success, - gboolean delete, + gboolean del, guint32 time) { GdkAtom target = GDK_NONE; g_return_if_fail (context != NULL); - if (success && delete) + if (success && del) { target = gdk_atom_intern ("DELETE", FALSE); } @@ -574,7 +574,7 @@ gtk_drag_finish (GdkDragContext *context, time); } - if (!delete) + if (!del) gdk_drop_finish (context, success, time); } diff --git a/gtk/gtkdnd.h b/gtk/gtkdnd.h index 8f313e70ee..399a0390de 100644 --- a/gtk/gtkdnd.h +++ b/gtk/gtkdnd.h @@ -44,7 +44,7 @@ void gtk_drag_get_data (GtkWidget *widget, guint32 time); void gtk_drag_finish (GdkDragContext *context, gboolean success, - gboolean delete, + gboolean del, guint32 time); void gtk_drag_highlight (GtkWidget *widget);