x11: Move selection-specific API into gdkx11selection.h

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 67e7b6a925989eec87623b749abc7f85e5bf4b96..ad795efb4df15930e0dc86973dff439779a927cd 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -219,6 +219,7 @@ x11_introspection_files =           \
        x11/gdkx11cursor.h              \
        x11/gdkx11display.h             \
        x11/gdkx11screen.h              \
+       x11/gdkx11selection.h           \
        x11/gdkx11visual.h              \
        x11/gdkx11window.h
 

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index 963d81b8fe1eef4b68bc18c5914b152fbb787083..0bc6348a953c217654099a6f40cf3980b20b09a6 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -79,6 +79,7 @@ libgdkx11include_HEADERS =    \
        gdkx11cursor.h          \
        gdkx11display.h         \
        gdkx11screen.h          \
+       gdkx11selection.h       \
        gdkx11visual.h          \
        gdkx11window.h
 

diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index e579bdc61fcfd76b66dd8d00b15de018eb7390ca..c3cea2d4a12f12a1e856508fc21f3b29815f5e9d 100644 (file)
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -58,6 +58,7 @@
 #include <gdk/x11/gdkx11cursor.h>
 #include <gdk/x11/gdkx11display.h>
 #include <gdk/x11/gdkx11screen.h>
+#include <gdk/x11/gdkx11selection.h>
 #include <gdk/x11/gdkx11visual.h>
 #include <gdk/x11/gdkx11window.h>
 
@@ -101,30 +102,6 @@ Atom                  gdk_x11_get_xatom_by_name (const gchar *atom_name);
 G_CONST_RETURN gchar *gdk_x11_get_xatom_name    (Atom         xatom);
 #endif
 
-gint     gdk_x11_display_text_property_to_text_list (GdkDisplay   *display,
-                                                     GdkAtom       encoding,
-                                                     gint          format,
-                                                     const guchar *text,
-                                                     gint          length,
-                                                     gchar      ***list);
-void     gdk_x11_free_text_list                     (gchar       **list);
-gint     gdk_x11_display_string_to_compound_text    (GdkDisplay   *display,
-                                                     const gchar  *str,
-                                                     GdkAtom      *encoding,
-                                                     gint         *format,
-                                                     guchar      **ctext,
-                                                     gint         *length);
-gboolean gdk_x11_display_utf8_to_compound_text      (GdkDisplay   *display,
-                                                     const gchar  *str,
-                                                     GdkAtom      *encoding,
-                                                     gint         *format,
-                                                     guchar      **ctext,
-                                                     gint         *length);
-void     gdk_x11_free_compound_text                 (guchar       *ctext);
-
-
-
-
 G_END_DECLS
 
 #endif /* __GDK_X_H__ */

diff --git a/gdk/x11/gdkx11selection.h b/gdk/x11/gdkx11selection.h
new file mode 100644 (file)
index 0000000..03b7ef0
--- /dev/null
+++ b/gdk/x11/gdkx11selection.h
@@ -0,0 +1,64 @@
+/* GDK - The GIMP Drawing Kit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION)
+#error "Only <gdk/gdkx.h> can be included directly."
+#endif
+
+#ifndef __GDK_X11_SELECTION_H__
+#define __GDK_X11_SELECTION_H__
+
+#include <gdk/gdk.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+G_BEGIN_DECLS
+
+gint     gdk_x11_display_text_property_to_text_list (GdkDisplay   *display,
+                                                     GdkAtom       encoding,
+                                                     gint          format,
+                                                     const guchar *text,
+                                                     gint          length,
+                                                     gchar      ***list);
+void     gdk_x11_free_text_list                     (gchar       **list);
+gint     gdk_x11_display_string_to_compound_text    (GdkDisplay   *display,
+                                                     const gchar  *str,
+                                                     GdkAtom      *encoding,
+                                                     gint         *format,
+                                                     guchar      **ctext,
+                                                     gint         *length);
+gboolean gdk_x11_display_utf8_to_compound_text      (GdkDisplay   *display,
+                                                     const gchar  *str,
+                                                     GdkAtom      *encoding,
+                                                     gint         *format,
+                                                     guchar      **ctext,
+                                                     gint         *length);
+void     gdk_x11_free_compound_text                 (guchar       *ctext);
+
+G_END_DECLS
+
+#endif /* __GDK_X11_SELECTION_H__ */