From 55f3451754eb284dde43fa46eebea61728c60c46 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Mon, 20 Dec 2010 15:25:50 +0100
Subject: [PATCH] x11: Move cursor API into gdkx11cursor.h

---
 gdk/Makefile.am        |  1 +
 gdk/x11/Makefile.am    |  1 +
 gdk/x11/gdkx.h         | 23 +--------------
 gdk/x11/gdkx11cursor.h | 66 ++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 22 deletions(-)
 create mode 100644 gdk/x11/gdkx11cursor.h

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index f35b349d0..0aeb3aba9 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -216,6 +216,7 @@ x11_introspection_files = 		\
 	x11/xsettings-client.c		\
 	x11/xsettings-common.c		\
         x11/gdkx.h			\
+	x11/gdkx11cursor.h		\
 	x11/gdkx11window.h
 
 GdkX11-3.0.gir: libgdk-3.0.la Gdk-3.0.gir Makefile
diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index caf2f0f8c..1776ba970 100644
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -76,6 +76,7 @@ libgdkinclude_HEADERS = 	\
 	gdkx.h
 
 libgdkx11include_HEADERS = 	\
+	gdkx11cursor.h		\
 	gdkx11window.h
 
 noinst_PROGRAMS = checksettings
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 9ee104863..fe56240e2 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -55,14 +55,13 @@
 
 #define __GDKX_H_INSIDE__
 
+#include <gdk/x11/gdkx11cursor.h>
 #include <gdk/x11/gdkx11window.h>
 
 #undef __GDKX_H_INSIDE__
 
 G_BEGIN_DECLS
 
-Display *gdk_x11_cursor_get_xdisplay      (GdkCursor   *cursor);
-Cursor   gdk_x11_cursor_get_xcursor       (GdkCursor   *cursor);
 Display *gdk_x11_display_get_xdisplay     (GdkDisplay  *display);
 Visual * gdk_x11_visual_get_xvisual       (GdkVisual   *visual);
 Screen * gdk_x11_screen_get_xscreen       (GdkScreen   *screen);
@@ -76,26 +75,6 @@ Display *gdk_x11_get_default_xdisplay     (void);
 gint     gdk_x11_get_default_screen       (void);
 #endif
 
-/**
- * GDK_CURSOR_XDISPLAY:
- * @cursor: a #GdkCursor.
- *
- * Returns the display of a #GdkCursor.
- *
- * Returns: an Xlib <type>Display*</type>.
- */
-#define GDK_CURSOR_XDISPLAY(cursor)   (gdk_x11_cursor_get_xdisplay (cursor))
-
-/**
- * GDK_CURSOR_XCURSOR:
- * @cursor: a #GdkCursor.
- *
- * Returns the X cursor belonging to a #GdkCursor.
- *
- * Returns: an Xlib <type>Cursor</type>.
- */
-#define GDK_CURSOR_XCURSOR(cursor)    (gdk_x11_cursor_get_xcursor (cursor))
-
 #define GDK_IS_DISPLAY_X11(object)   (G_TYPE_CHECK_INSTANCE_TYPE ((object), g_type_from_name ("GdkDisplayX11")))
 
 #ifndef GDK_MULTIHEAD_SAFE
diff --git a/gdk/x11/gdkx11cursor.h b/gdk/x11/gdkx11cursor.h
new file mode 100644
index 000000000..e0169baad
--- /dev/null
+++ b/gdk/x11/gdkx11cursor.h
@@ -0,0 +1,66 @@
+/* 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_CURSOR_H__
+#define __GDK_X11_CURSOR_H__
+
+#include <gdk/gdk.h>
+
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+
+G_BEGIN_DECLS
+
+Display *gdk_x11_cursor_get_xdisplay      (GdkCursor   *cursor);
+Cursor   gdk_x11_cursor_get_xcursor       (GdkCursor   *cursor);
+
+/**
+ * GDK_CURSOR_XDISPLAY:
+ * @cursor: a #GdkCursor.
+ *
+ * Returns the display of a #GdkCursor.
+ *
+ * Returns: an Xlib <type>Display*</type>.
+ */
+#define GDK_CURSOR_XDISPLAY(cursor)   (gdk_x11_cursor_get_xdisplay (cursor))
+
+/**
+ * GDK_CURSOR_XCURSOR:
+ * @cursor: a #GdkCursor.
+ *
+ * Returns the X cursor belonging to a #GdkCursor.
+ *
+ * Returns: an Xlib <type>Cursor</type>.
+ */
+#define GDK_CURSOR_XCURSOR(cursor)    (gdk_x11_cursor_get_xcursor (cursor))
+
+G_END_DECLS
+
+#endif /* __GDK_X11_CURSOR_H__ */
-- 
2.43.2