Modify the gettext translation domain for the gtk3 rename

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

diff --git a/gtk/gtkselection.h b/gtk/gtkselection.h
index 3f91e9e1e519a3922d90d265b9f6ad5a15ac72ab..ae689d552eaadcab2a56d82b5e212a99c8a35274 100644 (file)
--- a/gtk/gtkselection.h
+++ b/gtk/gtkselection.h
@@ -24,7 +24,7 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
-#if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
@@ -32,11 +32,10 @@
 #define __GTK_SELECTION_H__
 
 
-#include <gdk/gdk.h>
-#include <gtk/gtkenums.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtktextiter.h>
 
+
 G_BEGIN_DECLS
 
 typedef struct _GtkTargetList    GtkTargetList;
@@ -58,12 +57,12 @@ typedef struct _GtkTargetEntry   GtkTargetEntry;
 
 struct _GtkSelectionData
 {
-  GdkAtom      GSEAL (selection);
-  GdkAtom      GSEAL (target);
-  GdkAtom      GSEAL (type);
-  gint         GSEAL (format);
+  GdkAtom       GSEAL (selection);
+  GdkAtom       GSEAL (target);
+  GdkAtom       GSEAL (type);
+  gint          GSEAL (format);
   guchar       *GSEAL (data);
-  gint         GSEAL (length);
+  gint          GSEAL (length);
   GdkDisplay   *GSEAL (display);
 };
 
@@ -148,22 +147,15 @@ gboolean gtk_selection_convert       (GtkWidget            *widget,
                                      GdkAtom               selection,
                                      GdkAtom               target,
                                      guint32               time_);
-void gtk_selection_data_set_target (GtkSelectionData     *selection_data,
-                                   GdkAtom              target);
-GdkAtom gtk_selection_data_get_target (GtkSelectionData  *selection_data);
-void gtk_selection_data_set_data_type (GtkSelectionData     *selection_data,
-                                      GdkAtom              target);
-GdkAtom gtk_selection_data_get_data_type (GtkSelectionData  *selection_data);
-void gtk_selection_data_set_format (GtkSelectionData     *selection_data,
-                                   gint                  format);
-gint gtk_selection_data_get_format (GtkSelectionData  *selection_data);
-void gtk_selection_data_set_data (GtkSelectionData     *selection_data,
-                                 const guchar         *data);
-const guchar *gtk_selection_data_get_data (GtkSelectionData  *selection_data);
-void gtk_selection_data_set_length (GtkSelectionData     *selection_data,
-                                   gint                  length);
-gint gtk_selection_data_get_length (GtkSelectionData  *selection_data);
-GdkDisplay *gtk_selection_data_get_display (GtkSelectionData  *selection_data);
+
+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);
+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,
                                      GdkAtom               type,
                                      gint                  format,
@@ -205,10 +197,8 @@ gboolean gtk_targets_include_uri                 (GdkAtom       *targets,
 void gtk_selection_remove_all      (GtkWidget *widget);
 
 /* Event handlers */
-#if !defined(GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-gboolean gtk_selection_clear             (GtkWidget         *widget,
+gboolean _gtk_selection_clear            (GtkWidget         *widget,
                                           GdkEventSelection *event);
-#endif
 gboolean _gtk_selection_request                  (GtkWidget         *widget,
                                           GdkEventSelection *event);
 gboolean _gtk_selection_incr_event       (GdkWindow         *window,