AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

gdk: Move gdk_cursor_get_display() out of the backends

Browse Source 
Now that we store the display inside the cursor, that change is obvious.
This commit is contained in:
Benjamin Otte 2010-12-20 13:47:35 +01:00 committed by Matthias Clasen
parent 7a14b30ea3
commit 4793bd3399
4 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/gdkcursor.c
View File

@ -354,3 +354,23 @@ gdk_cursor_new_from_pixbuf (GdkDisplay *display,
return GDK_DISPLAY_GET_CLASS (display)->get_cursor_for_pixbuf (display, pixbuf, x, y); return GDK_DISPLAY_GET_CLASS (display)->get_cursor_for_pixbuf (display, pixbuf, x, y);
} }
/**
* gdk_cursor_get_display:
* @cursor: a #GdkCursor.
*
* Returns the display on which the #GdkCursor is defined.
*
* Returns: (transfer none): the #GdkDisplay associated to @cursor
*
* Since: 2.2
*/
GdkDisplay *
gdk_cursor_get_display (GdkCursor *cursor)
{
g_return_val_if_fail (GDK_IS_CURSOR (cursor), NULL);
return cursor->display;
}

8
gdk/quartz/gdkcursor-quartz.c
View File

@ -391,14 +391,6 @@ gdk_display_get_maximal_cursor_size (GdkDisplay *display,
*height = 65536; *height = 65536;
} }
GdkDisplay *
gdk_cursor_get_display (GdkCursor *cursor)
{
g_return_val_if_fail (cursor != NULL, NULL);
return gdk_display_get_default ();
}
GdkPixbuf * GdkPixbuf *
gdk_cursor_get_image (GdkCursor *cursor) gdk_cursor_get_image (GdkCursor *cursor)
{ {

6
gdk/win32/gdkcursor-win32.c
View File

@ -249,12 +249,6 @@ _gdk_cursor_destroy (GdkCursor *cursor)
g_free (private); g_free (private);
} }
GdkDisplay *
gdk_cursor_get_display (GdkCursor *cursor)
{
return gdk_display_get_default ();
}
GdkPixbuf * GdkPixbuf *
gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon) gdk_win32_icon_to_pixbuf_libgtk_only (HICON hicon)
{ {

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

@ -321,25 +321,6 @@ gdk_x11_cursor_get_xcursor (GdkCursor *cursor)
return ((GdkX11Cursor *)cursor)->xcursor; return ((GdkX11Cursor *)cursor)->xcursor;
} }
/**
* gdk_cursor_get_display:
* @cursor: a #GdkCursor.
*
* Returns the display on which the #GdkCursor is defined.
*
* Returns: (transfer none): the #GdkDisplay associated to @cursor
*
* Since: 2.2
*/
GdkDisplay *
gdk_cursor_get_display (GdkCursor *cursor)
{
g_return_val_if_fail (cursor != NULL, NULL);
return ((GdkX11Cursor *)cursor)->display;
}
#if defined(HAVE_XCURSOR) && defined(HAVE_XFIXES) && XFIXES_MAJOR >= 2 #if defined(HAVE_XCURSOR) && defined(HAVE_XFIXES) && XFIXES_MAJOR >= 2
/** /**