[gtk+/rendering-cleanup: 6/17] API: Remove gdk_x11_drawable_get_xdisplay()

[Benjamin Otte <otte src gnome org>]

commit aea8fbc9721fd17780c7ff9b270740b0fb316926
Author: Benjamin Otte <otte redhat com>
Date:   Wed Oct 6 01:14:32 2010 +0200

    API: Remove gdk_x11_drawable_get_xdisplay()
    
    No need for the function. Macros exist to do the same thing.

 docs/reference/gdk/gdk3-sections.txt       |    1 -
 docs/reference/gdk/tmpl/x_interaction.sgml |    9 --------
 gdk/x11/gdkdrawable-x11.c                  |   29 ----------------------------
 gdk/x11/gdkx.h                             |    3 +-
 4 files changed, 1 insertions(+), 41 deletions(-)
---
diff --git a/docs/reference/gdk/gdk3-sections.txt b/docs/reference/gdk/gdk3-sections.txt
index d67f6f0..690400c 100644
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -989,7 +989,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
diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml
index 37df7c3..0e6214d 100644
--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/docs/reference/gdk/tmpl/x_interaction.sgml
@@ -494,15 +494,6 @@ Another name for GDK_DRAWABLE_XID().
 @n_events: 
 
 
-<!-- ##### FUNCTION gdk_x11_drawable_get_xdisplay ##### -->
-<para>
-
-</para>
-
- drawable: 
- Returns: 
-
-
 <!-- ##### FUNCTION gdk_x11_window_get_xid ##### -->
 <para>
 
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index b87ff69..efa374f 100644
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -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)
 {
diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h
index 7ebdaad..473bf55 100644
--- a/gdk/x11/gdkx.h
+++ b/gdk/x11/gdkx.h
@@ -34,7 +34,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);
@@ -84,7 +83,7 @@ gint     gdk_x11_get_default_screen       (void);
 #define GDK_WINDOW_XDISPLAY(win)      (GDK_DISPLAY_XDISPLAY (gdk_window_get_display (win)))
 #define GDK_WINDOW_XID(win)           (gdk_x11_window_get_xid (win))
 #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))