X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gdk%2Fgdkcursor.h;h=16e965b9c976590aed6b3184a6f2b1e0f6ade9ed;hb=HEAD;hp=8a88545f1f3ff3c01ac09dff8b44d4367840b35e;hpb=3e068e921fa114d3668c53a239ac618f8fcd5110;p=~andy%2Fgtk diff --git a/gdk/gdkcursor.h b/gdk/gdkcursor.h index 8a88545f1..16e965b9c 100644 --- 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 . */ /* @@ -24,13 +22,14 @@ * 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 can be included directly." #endif -#ifndef __GDK_CURSOR_H__ -#define __GDK_CURSOR_H__ - +#include #include #include @@ -38,10 +37,7 @@ G_BEGIN_DECLS #define GDK_TYPE_CURSOR (gdk_cursor_get_type ()) #define GDK_CURSOR(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_CURSOR, GdkCursor)) -#define GDK_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_CURSOR, GdkCursorClass)) #define GDK_IS_CURSOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_CURSOR)) -#define GDK_IS_CURSOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_CURSOR)) -#define GDK_CURSOR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_CURSOR, GdkCursorClass)) /** @@ -231,10 +227,10 @@ GdkCursor* gdk_cursor_new_from_pixbuf (GdkDisplay *display, GdkCursor* gdk_cursor_new_from_name (GdkDisplay *display, const gchar *name); GdkDisplay* gdk_cursor_get_display (GdkCursor *cursor); -#ifndef GDK_DISABLE_DEPRECATED -GdkCursor* gdk_cursor_ref (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); -#endif GdkPixbuf* gdk_cursor_get_image (GdkCursor *cursor); GdkCursorType gdk_cursor_get_cursor_type (GdkCursor *cursor);