From c59f76082454c8b4f862e04bd73a87ad846825cd Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 29 Jan 2000 20:01:59 +0000 Subject: [PATCH] Removed duplicate prototypes for gdk_drag_get_selection() and Sun Jan 30 12:29:20 2000 Owen Taylor * gdk/gdk.h gtk/gtkmenu.h: Removed duplicate prototypes for gdk_drag_get_selection() and gtk_menu_detach(). [ From Jeroen Ruigrok/Asmodai ] --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gdk/gdk.h | 2 -- gtk/gtkmenu.h | 1 - 9 files changed, 49 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 290e69d96e..b7f3de5d69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Jan 30 12:29:20 2000 Owen Taylor + + * gdk/gdk.h gtk/gtkmenu.h: Removed duplicate prototypes for + gdk_drag_get_selection() and gtk_menu_detach(). + + [ From Jeroen Ruigrok/Asmodai ] + Sat Jan 29 10:11:56 2000 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_size_request): diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 290e69d96e..b7f3de5d69 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Sun Jan 30 12:29:20 2000 Owen Taylor + + * gdk/gdk.h gtk/gtkmenu.h: Removed duplicate prototypes for + gdk_drag_get_selection() and gtk_menu_detach(). + + [ From Jeroen Ruigrok/Asmodai ] + Sat Jan 29 10:11:56 2000 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_size_request): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 290e69d96e..b7f3de5d69 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sun Jan 30 12:29:20 2000 Owen Taylor + + * gdk/gdk.h gtk/gtkmenu.h: Removed duplicate prototypes for + gdk_drag_get_selection() and gtk_menu_detach(). + + [ From Jeroen Ruigrok/Asmodai ] + Sat Jan 29 10:11:56 2000 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_size_request): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 290e69d96e..b7f3de5d69 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Sun Jan 30 12:29:20 2000 Owen Taylor + + * gdk/gdk.h gtk/gtkmenu.h: Removed duplicate prototypes for + gdk_drag_get_selection() and gtk_menu_detach(). + + [ From Jeroen Ruigrok/Asmodai ] + Sat Jan 29 10:11:56 2000 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_size_request): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 290e69d96e..b7f3de5d69 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Sun Jan 30 12:29:20 2000 Owen Taylor + + * gdk/gdk.h gtk/gtkmenu.h: Removed duplicate prototypes for + gdk_drag_get_selection() and gtk_menu_detach(). + + [ From Jeroen Ruigrok/Asmodai ] + Sat Jan 29 10:11:56 2000 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_size_request): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 290e69d96e..b7f3de5d69 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sun Jan 30 12:29:20 2000 Owen Taylor + + * gdk/gdk.h gtk/gtkmenu.h: Removed duplicate prototypes for + gdk_drag_get_selection() and gtk_menu_detach(). + + [ From Jeroen Ruigrok/Asmodai ] + Sat Jan 29 10:11:56 2000 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_size_request): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 290e69d96e..b7f3de5d69 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sun Jan 30 12:29:20 2000 Owen Taylor + + * gdk/gdk.h gtk/gtkmenu.h: Removed duplicate prototypes for + gdk_drag_get_selection() and gtk_menu_detach(). + + [ From Jeroen Ruigrok/Asmodai ] + Sat Jan 29 10:11:56 2000 Owen Taylor * gtk/gtknotebook.c (gtk_notebook_size_request): diff --git a/gdk/gdk.h b/gdk/gdk.h index 8dbf3f6a1d..bfeb5f052c 100644 --- a/gdk/gdk.h +++ b/gdk/gdk.h @@ -299,8 +299,6 @@ void gdk_drag_drop (GdkDragContext *context, void gdk_drag_abort (GdkDragContext *context, guint32 time); -GdkAtom gdk_drag_get_selection (GdkDragContext *context); - /* GdkWindow */ void gdk_window_set_hints (GdkWindow *window, diff --git a/gtk/gtkmenu.h b/gtk/gtkmenu.h index 38ddb510b8..327bedd6a7 100644 --- a/gtk/gtkmenu.h +++ b/gtk/gtkmenu.h @@ -146,7 +146,6 @@ void gtk_menu_detach (GtkMenu *menu); */ GtkWidget* gtk_menu_get_attach_widget (GtkMenu *menu); -void gtk_menu_detach (GtkMenu *menu); void gtk_menu_set_tearoff_state (GtkMenu *menu, gboolean torn_off);