daemonratte/gtk2-ng
Watch
1
0
Fork
You've already forked gtk2-ng
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove GDK_CURSOR and GDK_IS_CURSOR, instance checks don't work on boxed

Browse source 
Sat Jun 18 04:22:51 2005  Manish Singh  <yosh@gimp.org>

        * gdk/gdkcursor.h: remove GDK_CURSOR and GDK_IS_CURSOR, instance
        checks don't work on boxed types.

        * gdk/x11/gdkcursor-x11.c:
        * gdk/gdkcursor.c: make return_if_fail checks != NULL instead of
        GDK_IS_CURSOR.
This commit is contained in:
Manish Singh 2005-06-18 11:25:14 +00:00 • committed by Manish Singh
commit 8e3ea42aba
6 changed files with 36 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Sat Jun 18 04:22:51 2005 Manish Singh <yosh@gimp.org>
* gdk/gdkcursor.h: remove GDK_CURSOR and GDK_IS_CURSOR, instance
checks don't work on boxed types.
* gdk/x11/gdkcursor-x11.c:
* gdk/gdkcursor.c: make return_if_fail checks != NULL instead of
GDK_IS_CURSOR.
Sat Jun 18 04:21:58 2005 Manish Singh <yosh@gimp.org>
* gtk/gtktreeview.c (do_presize_handler): remove unused variable

9
ChangeLog.pre-2-10
View file

@ -1,3 +1,12 @@
Sat Jun 18 04:22:51 2005 Manish Singh <yosh@gimp.org>
* gdk/gdkcursor.h: remove GDK_CURSOR and GDK_IS_CURSOR, instance
checks don't work on boxed types.
* gdk/x11/gdkcursor-x11.c:
* gdk/gdkcursor.c: make return_if_fail checks != NULL instead of
GDK_IS_CURSOR.
Sat Jun 18 04:21:58 2005 Manish Singh <yosh@gimp.org>
* gtk/gtktreeview.c (do_presize_handler): remove unused variable

9
ChangeLog.pre-2-8
View file

@ -1,3 +1,12 @@
Sat Jun 18 04:22:51 2005 Manish Singh <yosh@gimp.org>
* gdk/gdkcursor.h: remove GDK_CURSOR and GDK_IS_CURSOR, instance
checks don't work on boxed types.
* gdk/x11/gdkcursor-x11.c:
* gdk/gdkcursor.c: make return_if_fail checks != NULL instead of
GDK_IS_CURSOR.
Sat Jun 18 04:21:58 2005 Manish Singh <yosh@gimp.org>
* gtk/gtktreeview.c (do_presize_handler): remove unused variable

4
gdk/gdkcursor.c
View file

@ -53,7 +53,7 @@ gdk_cursor_get_type (void)
GdkCursor*
gdk_cursor_ref (GdkCursor *cursor)
{
g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
g_return_val_if_fail (cursor != NULL, NULL);
g_return_val_if_fail (cursor->ref_count > 0, NULL);
cursor->ref_count += 1;
@ -72,7 +72,7 @@ gdk_cursor_ref (GdkCursor *cursor)
void
gdk_cursor_unref (GdkCursor *cursor)
{
g_return_if_fail (GDK_IS_CURSOR (cursor));
g_return_if_fail (cursor != NULL);
g_return_if_fail (cursor->ref_count > 0);
cursor->ref_count -= 1;

2
gdk/gdkcursor.h
View file

@ -7,8 +7,6 @@
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_IS_CURSOR(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_CURSOR))
/* Cursor types.
*/

14
gdk/x11/gdkcursor-x11.c
View file

@ -255,7 +255,7 @@ _gdk_cursor_destroy (GdkCursor *cursor)
{
GdkCursorPrivate *private;
g_return_if_fail (GDK_IS_CURSOR (cursor));
g_return_if_fail (cursor != NULL);
g_return_if_fail (cursor->ref_count == 0);
private = (GdkCursorPrivate *) cursor;
@ -277,7 +277,7 @@ _gdk_cursor_destroy (GdkCursor *cursor)
Display *
gdk_x11_cursor_get_xdisplay (GdkCursor *cursor)
{
g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
g_return_val_if_fail (cursor != NULL, NULL);
return GDK_DISPLAY_XDISPLAY(((GdkCursorPrivate *)cursor)->display);
}
@ -293,7 +293,7 @@ gdk_x11_cursor_get_xdisplay (GdkCursor *cursor)
Cursor
gdk_x11_cursor_get_xcursor (GdkCursor *cursor)
{
g_return_val_if_fail (GDK_IS_CURSOR (cursor), None);
g_return_val_if_fail (cursor != NULL, None);
return ((GdkCursorPrivate *)cursor)->xcursor;
}
@ -312,7 +312,7 @@ gdk_x11_cursor_get_xcursor (GdkCursor *cursor)
GdkDisplay *
gdk_cursor_get_display (GdkCursor *cursor)
{
g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
g_return_val_if_fail (cursor != NULL, NULL);
return ((GdkCursorPrivate *)cursor)->display;
}
@ -346,7 +346,7 @@ gdk_cursor_get_image (GdkCursor *cursor)
GdkPixbuf *pixbuf;
gchar *theme;
g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
g_return_val_if_fail (cursor != NULL, NULL);
private = (GdkCursorPrivate *) cursor;
@ -498,7 +498,7 @@ gdk_x11_display_set_cursor_theme (GdkDisplay *display,
GdkPixbuf*
gdk_cursor_get_image (GdkCursor *cursor)
{
g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
g_return_val_if_fail (cursor != NULL, NULL);
return NULL;
}
@ -514,7 +514,7 @@ gdk_x11_display_set_cursor_theme (GdkDisplay *display,
void
_gdk_x11_cursor_update_theme (GdkCursor *cursor)
{
g_return_if_fail (GDK_IS_CURSOR (cursor));
g_return_if_fail (cursor != NULL);
}
#endif