x11: Use window macros instead of drawable macros

GDK_WINDOW_XID() instead of GDK_DRAWABLE_XID()
GDK_WINDOW_XDISPLAY() instead of GDK_DRAWABLE_XDISPLAY()

gdk/x11/gdkdevice-core.c

@@ -133,8 +133,8 @@ gdk_device_core_get_history (GdkDevice      *device,
   int i, j;
 
   impl_window = _gdk_window_get_impl_window (window);
-  xcoords = XGetMotionEvents (GDK_DRAWABLE_XDISPLAY (window),
-                              GDK_DRAWABLE_XID (impl_window),
+  xcoords = XGetMotionEvents (GDK_WINDOW_XDISPLAY (window),
+                              GDK_WINDOW_XID (impl_window),
                               start, stop, &tmp_n_events);
   if (!xcoords)
     return FALSE;

gdk/x11/gdkdisplay-x11.c

@@ -726,8 +726,8 @@ gdk_display_x11_translate_event (GdkEventTranslator *translator,
 	      Window child_window = 0;
 
 	      gdk_error_trap_push ();
-	      if (XTranslateCoordinates (GDK_DRAWABLE_XDISPLAY (window),
-					 GDK_DRAWABLE_XID (window),
+	      if (XTranslateCoordinates (GDK_WINDOW_XDISPLAY (window),
+					 GDK_WINDOW_XID (window),
 					 screen_x11->xroot_window,
 					 0, 0,
 					 &tx, &ty,

gdk/x11/gdkselection-x11.c

@@ -88,7 +88,7 @@ _gdk_selection_filter_clear_event (XSelectionClearEvent *event)
       if (gdk_window_get_display (info->owner) == display &&
 	  info->selection == gdk_x11_xatom_to_atom_for_display (display, event->selection))
 	{
-	  if ((GDK_DRAWABLE_XID (info->owner) == event->window &&
+	  if ((GDK_WINDOW_XID (info->owner) == event->window &&
 	       event->serial >= info->serial))
 	    {
 	      owner_list = g_slist_remove (owner_list, info);
@@ -296,8 +296,8 @@ gdk_selection_property_get (GdkWindow  *requestor,
      protocol, in which case the client has to make sure they'll be
      notified of PropertyChange events _before_ the property is deleted.
      Otherwise there's no guarantee we'll win the race ... */
-  if (XGetWindowProperty (GDK_DRAWABLE_XDISPLAY (requestor),
-			  GDK_DRAWABLE_XID (requestor),
+  if (XGetWindowProperty (GDK_WINDOW_XDISPLAY (requestor),
+			  GDK_WINDOW_XID (requestor),
 			  gdk_x11_atom_to_xatom_for_display (display, _gdk_selection_property),
 			  0, 0x1FFFFFFF /* MAXINT32 / 4 */, False, 
 			  AnyPropertyType, &prop_type, &prop_format,

gdk/x11/gdktestutils-x11.c

@@ -121,7 +121,7 @@ gdk_test_simulate_key (GdkWindow      *window,
   y = y + priv->abs_y;
 
   xev.type = key_pressrelease == GDK_KEY_PRESS ? KeyPress : KeyRelease;
-  xev.display = GDK_DRAWABLE_XDISPLAY (window);
+  xev.display = GDK_WINDOW_XDISPLAY (window);
   xev.window = GDK_WINDOW_XID (window);
   xev.root = RootWindow (xev.display, GDK_SCREEN_XNUMBER (screen));
   xev.subwindow = 0;
@@ -228,7 +228,7 @@ gdk_test_simulate_button (GdkWindow      *window,
   y = y + priv->abs_y;
 
   xev.type = button_pressrelease == GDK_BUTTON_PRESS ? ButtonPress : ButtonRelease;
-  xev.display = GDK_DRAWABLE_XDISPLAY (window);
+  xev.display = GDK_WINDOW_XDISPLAY (window);
   xev.window = GDK_WINDOW_XID (window);
   xev.root = RootWindow (xev.display, GDK_SCREEN_XNUMBER (screen));
   xev.subwindow = 0;

gdk/x11/gdkwindow-x11.c

@@ -306,8 +306,8 @@ tmp_unset_bg (GdkWindow *window)
 
   impl->no_bg = TRUE;
 
-  XSetWindowBackgroundPixmap (GDK_DRAWABLE_XDISPLAY (window),
-                              GDK_DRAWABLE_XID (window), None);
+  XSetWindowBackgroundPixmap (GDK_WINDOW_XDISPLAY (window),
+                              GDK_WINDOW_XID (window), None);
 }
 
 static void