Fix the check for no changes to position and size.

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

diff --git a/gdk/gdkcursor.c b/gdk/gdkcursor.c
index bdea57b5edfe18f3df81d439a428be8620ee68ff..23cb9525769e7a4d614ce2994af2c96d108e3808 100644 (file)
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -2,48 +2,102 @@
  * 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 Library General Public
+ * 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
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
+ * 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-1999.  See the AUTHORS
+ * 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/. 
  */
 
+#include <config.h>
 #include "gdkcursor.h"
-#include "gdkprivate.h"
+#include "gdkdisplay.h"
+#include "gdkinternals.h"
+#include "gdkalias.h"
 
+GType
+gdk_cursor_get_type (void)
+{
+  static GType our_type = 0;
+  
+  if (our_type == 0)
+    our_type = g_boxed_type_register_static (g_intern_static_string ("GdkCursor"),
+                                            (GBoxedCopyFunc)gdk_cursor_ref,
+                                            (GBoxedFreeFunc)gdk_cursor_unref);
+  return our_type;
+}
+
+/**
+ * gdk_cursor_ref:
+ * @cursor: a #GdkCursor
+ * 
+ * Adds a reference to @cursor.
+ * 
+ * Return value: Same @cursor that was passed in
+ **/
 GdkCursor*
 gdk_cursor_ref (GdkCursor *cursor)
 {
-  cursor->refcount += 1;
+  g_return_val_if_fail (cursor != NULL, NULL);
+  g_return_val_if_fail (cursor->ref_count > 0, NULL);
+
+  cursor->ref_count += 1;
 
   return cursor;
 }
 
+/**
+ * gdk_cursor_unref:
+ * @cursor: a #GdkCursor
+ *
+ * Removes a reference from @cursor, deallocating the cursor
+ * if no references remain.
+ * 
+ **/
 void
 gdk_cursor_unref (GdkCursor *cursor)
 {
   g_return_if_fail (cursor != NULL);
-  g_return_if_fail (cursor->refcount > 0);
+  g_return_if_fail (cursor->ref_count > 0);
 
-  cursor->refcount -= 1;
+  cursor->ref_count -= 1;
 
-  if (cursor->refcount == 0)
-    _gdk_cursor_destroy(cursor);
+  if (cursor->ref_count == 0)
+    _gdk_cursor_destroy (cursor);
+}
+
+/**
+ * gdk_cursor_new:
+ * @cursor_type: cursor to create
+ * 
+ * Creates a new cursor from the set of builtin cursors for the default display.
+ * See gdk_cursor_new_for_display().
+ *
+ * To make the cursor invisible, use gdk_cursor_new_from_pixmap() to create
+ * a cursor with no pixels in it.
+ * 
+ * Return value: a new #GdkCursor
+ **/
+GdkCursor*
+gdk_cursor_new (GdkCursorType cursor_type)
+{
+  return gdk_cursor_new_for_display (gdk_display_get_default(), cursor_type);
 }
 
+#define __GDK_CURSOR_C__
+#include "gdkaliasdef.c"