Commit 91679c38 authored by Benjamin Otte's avatar Benjamin Otte
Browse files

API: Remove gdk_x11_drawable_get_xdisplay()

No need for the function. Macros exist to do the same thing.
parent 0841281b
......@@ -1006,7 +1006,6 @@ gdk_x11_display_error_trap_pop
gdk_x11_display_error_trap_pop_ignored
gdk_x11_display_set_cursor_theme
gdk_x11_register_standard_event_type
gdk_x11_drawable_get_xdisplay
gdk_x11_window_get_xid
gdk_x11_get_default_root_xwindow
gdk_x11_get_default_screen
......
......@@ -547,7 +547,6 @@ gdk_x11_display_grab
gdk_x11_display_set_cursor_theme
gdk_x11_display_set_startup_notification_id
gdk_x11_display_ungrab
gdk_x11_drawable_get_xdisplay
gdk_x11_get_default_root_xwindow
gdk_x11_get_default_screen
gdk_x11_get_default_xdisplay
......
......@@ -105,35 +105,6 @@ _gdk_x11_drawable_update_size (GdkDrawable *drawable)
* X11 specific implementations of generic functions *
*****************************************************/
static GdkDrawable *
get_impl_drawable (GdkDrawable *drawable)
{
if (GDK_IS_WINDOW (drawable))
return ((GdkWindowObject *)drawable)->impl;
else
{
g_warning (G_STRLOC " drawable is not a window");
return NULL;
}
}
/**
* gdk_x11_drawable_get_xdisplay:
* @drawable: a #GdkDrawable.
*
* Returns the display of a #GdkDrawable.
*
* Return value: an Xlib <type>Display*</type>.
**/
Display *
gdk_x11_drawable_get_xdisplay (GdkDrawable *drawable)
{
if (GDK_IS_DRAWABLE_IMPL_X11 (drawable))
return GDK_SCREEN_XDISPLAY (GDK_DRAWABLE_IMPL_X11 (drawable)->screen);
else
return GDK_SCREEN_XDISPLAY (GDK_DRAWABLE_IMPL_X11 (get_impl_drawable (drawable))->screen);
}
static void
gdk_x11_cairo_surface_destroy (void *data)
{
......
......@@ -55,7 +55,6 @@ G_BEGIN_DECLS
*/
Display *gdk_x11_drawable_get_xdisplay (GdkDrawable *drawable);
Window gdk_x11_window_get_xid (GdkWindow *window);
Display *gdk_x11_cursor_get_xdisplay (GdkCursor *cursor);
Cursor gdk_x11_cursor_get_xcursor (GdkCursor *cursor);
......@@ -193,7 +192,7 @@ gint gdk_x11_get_default_screen (void);
* Another name for GDK_DRAWABLE_XID().
*/
#define GDK_WINDOW_XWINDOW(win) (gdk_x11_window_get_xid (win))
#define GDK_DRAWABLE_XDISPLAY(win) (gdk_x11_drawable_get_xdisplay (win))
#define GDK_DRAWABLE_XDISPLAY(win) (GDK_WINDOW_XDISPLAY (win))
#define GDK_DRAWABLE_XID(win) (gdk_x11_window_get_xid (win))
#define GDK_SCREEN_XDISPLAY(screen) (gdk_x11_display_get_xdisplay (gdk_screen_get_display (screen)))
#define GDK_SCREEN_XSCREEN(screen) (gdk_x11_screen_get_xscreen (screen))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment