x11: Store GDK name in xsettings hash table

[~andy/gtk] / gdk / gdkcursor.h

diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h
index a4218283890b1f70637c788acae30553b9fc3688..16e965b9c976590aed6b3184a6f2b1e0f6ade9ed 100644 (file)
--- a/gdk/gdkcursor.h
+++ b/gdk/gdkcursor.h
@@ -12,9 +12,7 @@
  * 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.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -24,19 +22,23 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#ifndef __GDK_CURSOR_H__
+#define __GDK_CURSOR_H__
+
 #if !defined (__GDK_H_INSIDE__) && !defined (GDK_COMPILATION)
 #error "Only <gdk/gdk.h> can be included directly."
 #endif
 
-#ifndef __GDK_CURSOR_H__
-#define __GDK_CURSOR_H__
-
+#include <gdk/gdkversionmacros.h>
 #include <gdk/gdktypes.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
 G_BEGIN_DECLS
 
-#define GDK_TYPE_CURSOR (gdk_cursor_get_type ())
+#define GDK_TYPE_CURSOR              (gdk_cursor_get_type ())
+#define GDK_CURSOR(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_CURSOR, GdkCursor))
+#define GDK_IS_CURSOR(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_CURSOR))
+
 
 /**
  * GdkCursorType:
@@ -208,18 +210,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
  */
 
@@ -234,11 +224,13 @@ GdkCursor* gdk_cursor_new_from_pixbuf      (GdkDisplay      *display,
                                          GdkPixbuf       *pixbuf,
                                          gint             x,
                                          gint             y);
-GdkDisplay* gdk_cursor_get_display      (GdkCursor       *cursor);
-GdkCursor*  gdk_cursor_ref               (GdkCursor       *cursor);
-void        gdk_cursor_unref             (GdkCursor       *cursor);
 GdkCursor*  gdk_cursor_new_from_name    (GdkDisplay      *display,
                                          const gchar     *name);
+GdkDisplay* gdk_cursor_get_display      (GdkCursor       *cursor);
+GDK_DEPRECATED_IN_3_0_FOR(g_object_ref)
+GdkCursor * gdk_cursor_ref               (GdkCursor       *cursor);
+GDK_DEPRECATED_IN_3_0_FOR(g_object_unref)
+void        gdk_cursor_unref             (GdkCursor       *cursor);
 GdkPixbuf*  gdk_cursor_get_image         (GdkCursor       *cursor);
 GdkCursorType gdk_cursor_get_cursor_type (GdkCursor       *cursor);