[gtk+] Remove GDK_DISPLAY() usage

[Matthias Clasen <matthiasc src gnome org>]

commit 95eb4a868e4917b9df9677543ff0be5584383f4d
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Sep 9 21:55:28 2010 -0400

    Remove GDK_DISPLAY() usage

 docs/tools/shooter.c |    6 +++---
 docs/tools/widgets.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/docs/tools/shooter.c b/docs/tools/shooter.c
index 0ed6182..d73117b 100644
--- a/docs/tools/shooter.c
+++ b/docs/tools/shooter.c
@@ -33,7 +33,7 @@ find_toplevel_window (Window xid)
 
   do
     {
-      if (XQueryTree (GDK_DISPLAY (), xid, &root,
+      if (XQueryTree (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xid, &root,
 		      &parent, &children, &nchildren) == 0)
 	{
 	  g_warning ("Couldn't find window manager window");
@@ -82,7 +82,7 @@ remove_shaped_area (GdkPixbuf *pixbuf,
 			   gdk_pixbuf_get_height (pixbuf));
   
   gdk_pixbuf_fill (retval, 0);
-  rectangles = XShapeGetRectangles (GDK_DISPLAY (), window,
+  rectangles = XShapeGetRectangles (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), window,
 				    ShapeBounding, &rectangle_count, &rectangle_order);
 
   for (i = 0; i < rectangle_count; i++)
@@ -130,7 +130,7 @@ take_window_shot (Window   child,
   GdkPixbuf *tmp, *tmp2;
   GdkPixbuf *retval;
 
-  disp = GDK_DISPLAY ();
+  disp = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
   w = GDK_ROOT_WINDOW ();
 
   if (include_decoration)
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index e30f391..1b1d824 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -21,7 +21,7 @@ find_toplevel_window (Window xid)
 
   do
     {
-      if (XQueryTree (GDK_DISPLAY (), xid, &root,
+      if (XQueryTree (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), xid, &root,
 		      &parent, &children, &nchildren) == 0)
 	{
 	  g_warning ("Couldn't find window manager window");