callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve some return_if_fail checks, and add the missing non-Xcursor

Browse Source 
2005-06-17  Matthias Clasen  <mclasen@redhat.com>

	* gdk/x11/gdkcursor-x11.c:
	* gdk/gdkcursor.c: Improve some return_if_fail checks,
	and add the missing non-Xcursor fallback for
	_gdk_x11_cursor_update_theme(), noticed by Jeroen
	Zwartepoorte.
This commit is contained in:
Matthias Clasen
2005-06-17 19:27:04 +00:00
committed by Matthias Clasen
parent c06b5609d2
commit 3d6ed0595f
5 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,11 @@
2005-06-17 Matthias Clasen <mclasen@redhat.com> 2005-06-17 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkcursor-x11.c:
* gdk/gdkcursor.c: Improve some return_if_fail checks,
and add the missing non-Xcursor fallback for
_gdk_x11_cursor_update_theme(), noticed by Jeroen
Zwartepoorte.
* gtk/gtkbutton.c (gtk_button_class_init): Document * gtk/gtkbutton.c (gtk_button_class_init): Document
several button signals as not useful. several button signals as not useful.
@ -485,8 +491,6 @@ Fri Jun 10 19:06:03 2005 Manish Singh <yosh@gimp.org>
* gtk/gtkimage.c: Make the file property readable. * gtk/gtkimage.c: Make the file property readable.
(#170674, Lorenzo Gil Sanchez) (#170674, Lorenzo Gil Sanchez)
==================================================================
==================================================================
2005-06-08 Matthias Clasen <mclasen@redhat.com> 2005-06-08 Matthias Clasen <mclasen@redhat.com>

8
ChangeLog.pre-2-10
View File

@ -1,5 +1,11 @@
2005-06-17 Matthias Clasen <mclasen@redhat.com> 2005-06-17 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkcursor-x11.c:
* gdk/gdkcursor.c: Improve some return_if_fail checks,
and add the missing non-Xcursor fallback for
_gdk_x11_cursor_update_theme(), noticed by Jeroen
Zwartepoorte.
* gtk/gtkbutton.c (gtk_button_class_init): Document * gtk/gtkbutton.c (gtk_button_class_init): Document
several button signals as not useful. several button signals as not useful.
@ -485,8 +491,6 @@ Fri Jun 10 19:06:03 2005 Manish Singh <yosh@gimp.org>
* gtk/gtkimage.c: Make the file property readable. * gtk/gtkimage.c: Make the file property readable.
(#170674, Lorenzo Gil Sanchez) (#170674, Lorenzo Gil Sanchez)
==================================================================
==================================================================
2005-06-08 Matthias Clasen <mclasen@redhat.com> 2005-06-08 Matthias Clasen <mclasen@redhat.com>

8
ChangeLog.pre-2-8
View File

@ -1,5 +1,11 @@
2005-06-17 Matthias Clasen <mclasen@redhat.com> 2005-06-17 Matthias Clasen <mclasen@redhat.com>
* gdk/x11/gdkcursor-x11.c:
* gdk/gdkcursor.c: Improve some return_if_fail checks,
and add the missing non-Xcursor fallback for
_gdk_x11_cursor_update_theme(), noticed by Jeroen
Zwartepoorte.
* gtk/gtkbutton.c (gtk_button_class_init): Document * gtk/gtkbutton.c (gtk_button_class_init): Document
several button signals as not useful. several button signals as not useful.
@ -485,8 +491,6 @@ Fri Jun 10 19:06:03 2005 Manish Singh <yosh@gimp.org>
* gtk/gtkimage.c: Make the file property readable. * gtk/gtkimage.c: Make the file property readable.
(#170674, Lorenzo Gil Sanchez) (#170674, Lorenzo Gil Sanchez)
==================================================================
==================================================================
2005-06-08 Matthias Clasen <mclasen@redhat.com> 2005-06-08 Matthias Clasen <mclasen@redhat.com>

4
gdk/gdkcursor.c
View File

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

18
gdk/x11/gdkcursor-x11.c
View File

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