Merge branch 'master' into toolpalette

[~andy/gtk] / gtk / gtkselection.h

diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index f8c3ed1761e51d2779e07736f374371466399bf4..55bfcad89ac912e6b285083734e6ad324c0bd730 100644 (file)
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -1,4 +1,4 @@
-/* GTK - The GTK+ Toolkit
+/* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * This library is free software; you can redistribute it and/or
@@ -31,10 +31,11 @@
 #ifndef __GTK_SELECTION_H__
 #define __GTK_SELECTION_H__
 
-#include <gtk/gtkenums.h>
+
 #include <gtk/gtkwidget.h>
 #include <gtk/gtktextiter.h>
 
+
 G_BEGIN_DECLS
 
 typedef struct _GtkTargetList    GtkTargetList;
@@ -147,11 +148,12 @@ gboolean gtk_selection_convert       (GtkWidget            *widget,
                                      GdkAtom               target,
                                      guint32               time_);
 
+GdkAtom       gtk_selection_data_get_selection (GtkSelectionData *selection_data);
 GdkAtom       gtk_selection_data_get_target    (GtkSelectionData *selection_data);
 GdkAtom       gtk_selection_data_get_data_type (GtkSelectionData *selection_data);
 gint          gtk_selection_data_get_format    (GtkSelectionData *selection_data);
-const guchar *gtk_selection_data_get_data      (GtkSelectionData *selection_data,
-                                                guint           *length);
+const guchar *gtk_selection_data_get_data      (GtkSelectionData *selection_data);
+gint          gtk_selection_data_get_length    (GtkSelectionData *selection_data);
 GdkDisplay   *gtk_selection_data_get_display   (GtkSelectionData *selection_data);
 
 void     gtk_selection_data_set      (GtkSelectionData     *selection_data,