[gtk+/gdk-backend] gdk: Move GdkCursor definition into a private header
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gdk-backend] gdk: Move GdkCursor definition into a private header
- Date: Mon, 20 Dec 2010 13:14:27 +0000 (UTC)
commit 4aa85b0c74b8b6fdbd65f8168c5e2bf45d29c11f
Author: Benjamin Otte <otte redhat com>
Date: Mon Dec 20 02:20:48 2010 +0100
gdk: Move GdkCursor definition into a private header
gdk/Makefile.am | 1 +
gdk/gdkcursor.c | 6 ++++++
gdk/gdkcursor.h | 12 ------------
gdk/gdkcursorprivate.h | 43 +++++++++++++++++++++++++++++++++++++++++++
gdk/x11/gdkcursor-x11.c | 1 +
5 files changed, 51 insertions(+), 12 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index b07af09..d7e1374 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -96,6 +96,7 @@ gdk_built_public_sources = \
gdk_private_headers = \
gdkapplaunchcontextprivate.h \
+ gdkcursorprivate.h \
gdkdevicemanagerprivate.h \
gdkdeviceprivate.h \
gdkdisplaymanagerprivate.h \
diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index 016723e..1609c9c 100644
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -27,6 +27,7 @@
#include "config.h"
#include "gdkcursor.h"
+#include "gdkcursorprivate.h"
#include "gdkdisplayprivate.h"
#include "gdkinternals.h"
@@ -52,6 +53,11 @@
* #GdkWindowAttr struct passed to gdk_window_new().
*/
+/**
+ * GdkCursor:
+ *
+ * The #GdkCursor structure represents a cursor. Its contents are private.
+ */
G_DEFINE_BOXED_TYPE (GdkCursor, gdk_cursor,
gdk_cursor_ref,
diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index a421828..5979148 100644
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -208,18 +208,6 @@ typedef enum
GDK_CURSOR_IS_PIXMAP = -1
} GdkCursorType;
-/**
- * GdkCursor:
- *
- * A #GdkCursor structure represents a cursor.
- */
-struct _GdkCursor
-{
- /*< private >*/
- GdkCursorType GSEAL (type);
- guint GSEAL (ref_count);
-};
-
/* Cursors
*/
diff --git a/gdk/gdkcursorprivate.h b/gdk/gdkcursorprivate.h
new file mode 100644
index 0000000..8b174b6
--- /dev/null
+++ b/gdk/gdkcursorprivate.h
@@ -0,0 +1,43 @@
+/* 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/.
+ */
+
+#ifndef __GDK_CURSOR_PRIVATE_H__
+#define __GDK_CURSOR_PRIVATE_H__
+
+#include <gdk/gdkcursor.h>
+
+G_BEGIN_DECLS
+
+struct _GdkCursor
+{
+ /*< private >*/
+ GdkCursorType type;
+ guint ref_count;
+};
+
+G_END_DECLS
+
+#endif /* __GDK_CURSOR_PRIVATE_H__ */
diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
index 5577033..d6b6adc 100644
--- a/gdk/x11/gdkcursor-x11.c
+++ b/gdk/x11/gdkcursor-x11.c
@@ -31,6 +31,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include "gdkcursor.h"
+#include "gdkcursorprivate.h"
#include "gdkprivate-x11.h"
#include "gdkdisplay-x11.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]