GNOME.org
 

[gtk+/rendering-cleanup: 7/17] x11: Use window macros instead of drawable macros

commit d40b4c74266a47fd2079061a203658e80fa45332
Author: Benjamin Otte <otte redhat com>
Date:   Wed Oct 6 01:22:45 2010 +0200

    x11: Use window macros instead of drawable macros
    
    GDK_WINDOW_XID() instead of GDK_DRAWABLE_XID()
    GDK_WINDOW_XDISPLAY() instead of GDK_DRAWABLE_XDISPLAY()

 docs/reference/gdk/tmpl/x_interaction.sgml |    6 +-
 gdk/x11/gdkdevice-core.c                   |    4 +-
 gdk/x11/gdkdisplay-x11.c                   |    4 +-
 gdk/x11/gdkdnd-x11.c                       |  118 ++++++++++++++--------------
 gdk/x11/gdkselection-x11.c                 |    6 +-
 gdk/x11/gdktestutils-x11.c                 |    4 +-
 gdk/x11/gdkwindow-x11.c                    |    4 +-
 7 files changed, 73 insertions(+), 73 deletions(-)
---
diff --git a/docs/reference/gdk/tmpl/x_interaction.sgml b/docs/reference/gdk/tmpl/x_interaction.sgml
index 0e6214d..cc33e45 100644
--- a/docs/reference/gdk/tmpl/x_interaction.sgml
+++ b/docs/reference/gdk/tmpl/x_interaction.sgml
@@ -79,7 +79,7 @@ Returns the display of a #GdkDisplay.
 @display: a #GdkDisplay.
 
 
-<!-- ##### MACRO GDK_DRAWABLE_XDISPLAY ##### -->
+<!-- ##### MACRO GDK_WINDOW_XDISPLAY ##### -->
 <para>
 Returns the display of a #GdkDrawable.
 </para>
@@ -88,7 +88,7 @@ Returns the display of a #GdkDrawable.
 @Returns: an Xlib <type>Display*</type>.
 
 
-<!-- ##### MACRO GDK_DRAWABLE_XID ##### -->
+<!-- ##### MACRO GDK_WINDOW_XID ##### -->
 <para>
 Returns the X resource (window or pixmap) belonging to a #GdkDrawable.
 </para>
@@ -172,7 +172,7 @@ Returns the display of a #GdkCursor.
 
 <!-- ##### MACRO GDK_WINDOW_XWINDOW ##### -->
 <para>
-Another name for GDK_DRAWABLE_XID(). 
+Another name for GDK_WINDOW_XID(). 
 </para>
 
 
diff --git a/gdk/x11/gdkdevice-core.c b/gdk/x11/gdkdevice-core.c
index a947fec..bc4dd34 100644
--- a/gdk/x11/gdkdevice-core.c
+++ b/gdk/x11/gdkdevice-core.c
@@ -132,8 +132,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;
diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
index a7213f2..1ee5d6a 100644
--- a/gdk/x11/gdkdisplay-x11.c
+++ b/gdk/x11/gdkdisplay-x11.c
@@ -725,8 +725,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,
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 3a889b7..3ef1d9c 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -293,12 +293,12 @@ gdk_drag_context_find (GdkDisplay *display,
       context_dest_xid = context->dest_window ? 
                             (private->drop_xid ?
                               private->drop_xid :
-                              GDK_DRAWABLE_XID (context->dest_window)) :
+                              GDK_WINDOW_XID (context->dest_window)) :
 	                     None;
 
       if ((!context->is_source == !is_source) &&
 	  ((source_xid == None) || (context->source_window &&
-	    (GDK_DRAWABLE_XID (context->source_window) == source_xid))) &&
+	    (GDK_WINDOW_XID (context->source_window) == source_xid))) &&
 	  ((dest_xid == None) || (context_dest_xid == dest_xid)))
 	return context;
       
@@ -1404,8 +1404,8 @@ motif_set_targets (GdkDragContext *context)
 
   info.selection_atom = private->motif_selection;
 
-  XChangeProperty (GDK_DRAWABLE_XDISPLAY (context->source_window),
-		   GDK_DRAWABLE_XID (context->source_window),
+  XChangeProperty (GDK_WINDOW_XDISPLAY (context->source_window),
+		   GDK_WINDOW_XID (context->source_window),
 		   private->motif_selection,
 		   gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_INITIATOR_INFO"),
 		   8, PropModeReplace,
@@ -1474,13 +1474,13 @@ motif_send_enter (GdkDragContext  *context,
   xev.xclient.type = ClientMessage;
   xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_AND_DROP_MESSAGE");
   xev.xclient.format = 8;
-  xev.xclient.window = GDK_DRAWABLE_XID (context->dest_window);
+  xev.xclient.window = GDK_WINDOW_XID (context->dest_window);
 
   MOTIF_XCLIENT_BYTE (&xev, 0) = XmTOP_LEVEL_ENTER;
   MOTIF_XCLIENT_BYTE (&xev, 1) = local_byte_order;
   MOTIF_XCLIENT_SHORT (&xev, 1) = 0;
   MOTIF_XCLIENT_LONG (&xev, 1) = time;
-  MOTIF_XCLIENT_LONG (&xev, 2) = GDK_DRAWABLE_XID (context->source_window);
+  MOTIF_XCLIENT_LONG (&xev, 2) = GDK_WINDOW_XID (context->source_window);
 
   if (!private->motif_targets_set)
     motif_set_targets (context);
@@ -1489,11 +1489,11 @@ motif_send_enter (GdkDragContext  *context,
   MOTIF_XCLIENT_LONG (&xev, 4) = 0;
 
   if (!_gdk_send_xevent (display,
-			 GDK_DRAWABLE_XID (context->dest_window),
+			 GDK_WINDOW_XID (context->dest_window),
 			 FALSE, 0, &xev))
     GDK_NOTE (DND, 
 	      g_message ("Send event to %lx failed",
-			 GDK_DRAWABLE_XID (context->dest_window)));
+			 GDK_WINDOW_XID (context->dest_window)));
 }
 
 static void
@@ -1506,7 +1506,7 @@ motif_send_leave (GdkDragContext  *context,
   xev.xclient.type = ClientMessage;
   xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_AND_DROP_MESSAGE");
   xev.xclient.format = 8;
-  xev.xclient.window = GDK_DRAWABLE_XID (context->dest_window);
+  xev.xclient.window = GDK_WINDOW_XID (context->dest_window);
 
   MOTIF_XCLIENT_BYTE (&xev, 0) = XmTOP_LEVEL_LEAVE;
   MOTIF_XCLIENT_BYTE (&xev, 1) = local_byte_order;
@@ -1517,11 +1517,11 @@ motif_send_leave (GdkDragContext  *context,
   MOTIF_XCLIENT_LONG (&xev, 4) = 0;
 
   if (!_gdk_send_xevent (display,
-			 GDK_DRAWABLE_XID (context->dest_window),
+			 GDK_WINDOW_XID (context->dest_window),
 			 FALSE, 0, &xev))
     GDK_NOTE (DND, 
 	      g_message ("Send event to %lx failed",
-			 GDK_DRAWABLE_XID (context->dest_window)));
+			 GDK_WINDOW_XID (context->dest_window)));
 }
 
 static gboolean
@@ -1539,7 +1539,7 @@ motif_send_motion (GdkDragContext  *context,
   xev.xclient.type = ClientMessage;
   xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_AND_DROP_MESSAGE");
   xev.xclient.format = 8;
-  xev.xclient.window = GDK_DRAWABLE_XID (context->dest_window);
+  xev.xclient.window = GDK_WINDOW_XID (context->dest_window);
 
   MOTIF_XCLIENT_BYTE (&xev, 1) = local_byte_order;
   MOTIF_XCLIENT_SHORT (&xev, 1) = motif_dnd_get_flags (context);
@@ -1567,11 +1567,11 @@ motif_send_motion (GdkDragContext  *context,
     }
 
   if (!_gdk_send_xevent (display,
-			 GDK_DRAWABLE_XID (context->dest_window),
+			 GDK_WINDOW_XID (context->dest_window),
 			 FALSE, 0, &xev))
     GDK_NOTE (DND, 
 	      g_message ("Send event to %lx failed",
-			 GDK_DRAWABLE_XID (context->dest_window)));
+			 GDK_WINDOW_XID (context->dest_window)));
 
   return retval;
 }
@@ -1586,7 +1586,7 @@ motif_send_drop (GdkDragContext *context, guint32 time)
   xev.xclient.type = ClientMessage;
   xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "_MOTIF_DRAG_AND_DROP_MESSAGE");
   xev.xclient.format = 8;
-  xev.xclient.window = GDK_DRAWABLE_XID (context->dest_window);
+  xev.xclient.window = GDK_WINDOW_XID (context->dest_window);
 
   MOTIF_XCLIENT_BYTE (&xev, 0) = XmDROP_START;
   MOTIF_XCLIENT_BYTE (&xev, 1) = local_byte_order;
@@ -1597,14 +1597,14 @@ motif_send_drop (GdkDragContext *context, guint32 time)
   MOTIF_XCLIENT_SHORT (&xev, 5) = private->last_y;
 
   MOTIF_XCLIENT_LONG (&xev, 3)  = private->motif_selection;
-  MOTIF_XCLIENT_LONG (&xev, 4)  = GDK_DRAWABLE_XID (context->source_window);
+  MOTIF_XCLIENT_LONG (&xev, 4)  = GDK_WINDOW_XID (context->source_window);
 
   if (!_gdk_send_xevent (display,
-			 GDK_DRAWABLE_XID (context->dest_window),
+			 GDK_WINDOW_XID (context->dest_window),
 			 FALSE, 0, &xev))
     GDK_NOTE (DND, 
 	      g_message ("Send event to %lx failed",
-			 GDK_DRAWABLE_XID (context->dest_window)));
+			 GDK_WINDOW_XID (context->dest_window)));
 }
 
 /* Target Side */
@@ -1923,7 +1923,7 @@ motif_drag_status (GdkEvent *event,
   if (!display)
     return GDK_FILTER_REMOVE;
   
-  context = gdk_drag_context_find (display, TRUE, GDK_DRAWABLE_XID (event->any.window), None);
+  context = gdk_drag_context_find (display, TRUE, GDK_WINDOW_XID (event->any.window), None);
 
   if (context)
     {
@@ -2227,8 +2227,8 @@ xdnd_set_targets (GdkDragContext *context)
       i++;
     }
 
-  XChangeProperty (GDK_DRAWABLE_XDISPLAY (context->source_window),
-		   GDK_DRAWABLE_XID (context->source_window),
+  XChangeProperty (GDK_WINDOW_XDISPLAY (context->source_window),
+		   GDK_WINDOW_XID (context->source_window),
 		   gdk_x11_get_xatom_by_name_for_display (display, "XdndTypeList"),
 		   XA_ATOM, 32, PropModeReplace,
 		   (guchar *)atomlist, n_atoms);
@@ -2276,8 +2276,8 @@ xdnd_set_actions (GdkDragContext *context)
 	}
     }
 
-  XChangeProperty (GDK_DRAWABLE_XDISPLAY (context->source_window),
-		   GDK_DRAWABLE_XID (context->source_window),
+  XChangeProperty (GDK_WINDOW_XDISPLAY (context->source_window),
+		   GDK_WINDOW_XID (context->source_window),
 		   gdk_x11_get_xatom_by_name_for_display (display, "XdndActionList"),
 		   XA_ATOM, 32, PropModeReplace,
 		   (guchar *)atomlist, n_atoms);
@@ -2421,8 +2421,8 @@ xdnd_send_enter (GdkDragContext *context)
   xev.xclient.format = 32;
   xev.xclient.window = private->drop_xid ? 
                            private->drop_xid : 
-                           GDK_DRAWABLE_XID (context->dest_window);
-  xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->source_window);
+                           GDK_WINDOW_XID (context->dest_window);
+  xev.xclient.data.l[0] = GDK_WINDOW_XID (context->source_window);
   xev.xclient.data.l[1] = (private->version << 24); /* version */
   xev.xclient.data.l[2] = 0;
   xev.xclient.data.l[3] = 0;
@@ -2430,7 +2430,7 @@ xdnd_send_enter (GdkDragContext *context)
 
   GDK_NOTE(DND,
 	   g_message ("Sending enter source window %#lx XDND protocol version %d\n",
-		      GDK_DRAWABLE_XID (context->source_window), private->version));
+		      GDK_WINDOW_XID (context->source_window), private->version));
   if (g_list_length (context->targets) > 3)
     {
       if (!private->xdnd_targets_set)
@@ -2456,7 +2456,7 @@ xdnd_send_enter (GdkDragContext *context)
     {
       GDK_NOTE (DND, 
 		g_message ("Send event to %lx failed",
-			   GDK_DRAWABLE_XID (context->dest_window)));
+			   GDK_WINDOW_XID (context->dest_window)));
       g_object_unref (context->dest_window);
       context->dest_window = NULL;
     }
@@ -2475,8 +2475,8 @@ xdnd_send_leave (GdkDragContext *context)
   xev.xclient.format = 32;
   xev.xclient.window = private->drop_xid ? 
                            private->drop_xid : 
-                           GDK_DRAWABLE_XID (context->dest_window);
-  xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->source_window);
+                           GDK_WINDOW_XID (context->dest_window);
+  xev.xclient.data.l[0] = GDK_WINDOW_XID (context->source_window);
   xev.xclient.data.l[1] = 0;
   xev.xclient.data.l[2] = 0;
   xev.xclient.data.l[3] = 0;
@@ -2487,7 +2487,7 @@ xdnd_send_leave (GdkDragContext *context)
     {
       GDK_NOTE (DND, 
 		g_message ("Send event to %lx failed",
-			   GDK_DRAWABLE_XID (context->dest_window)));
+			   GDK_WINDOW_XID (context->dest_window)));
       g_object_unref (context->dest_window);
       context->dest_window = NULL;
     }
@@ -2505,8 +2505,8 @@ xdnd_send_drop (GdkDragContext *context, guint32 time)
   xev.xclient.format = 32;
   xev.xclient.window = private->drop_xid ? 
                            private->drop_xid : 
-                           GDK_DRAWABLE_XID (context->dest_window);
-  xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->source_window);
+                           GDK_WINDOW_XID (context->dest_window);
+  xev.xclient.data.l[0] = GDK_WINDOW_XID (context->source_window);
   xev.xclient.data.l[1] = 0;
   xev.xclient.data.l[2] = time;
   xev.xclient.data.l[3] = 0;
@@ -2517,7 +2517,7 @@ xdnd_send_drop (GdkDragContext *context, guint32 time)
     {
       GDK_NOTE (DND, 
 		g_message ("Send event to %lx failed",
-			   GDK_DRAWABLE_XID (context->dest_window)));
+			   GDK_WINDOW_XID (context->dest_window)));
       g_object_unref (context->dest_window);
       context->dest_window = NULL;
     }
@@ -2539,8 +2539,8 @@ xdnd_send_motion (GdkDragContext *context,
   xev.xclient.format = 32;
   xev.xclient.window = private->drop_xid ? 
                            private->drop_xid : 
-                           GDK_DRAWABLE_XID (context->dest_window);
-  xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->source_window);
+                           GDK_WINDOW_XID (context->dest_window);
+  xev.xclient.data.l[0] = GDK_WINDOW_XID (context->source_window);
   xev.xclient.data.l[1] = 0;
   xev.xclient.data.l[2] = (x_root << 16) | y_root;
   xev.xclient.data.l[3] = time;
@@ -2551,7 +2551,7 @@ xdnd_send_motion (GdkDragContext *context,
     {
       GDK_NOTE (DND, 
 		g_message ("Send event to %lx failed",
-			   GDK_DRAWABLE_XID (context->dest_window)));
+			   GDK_WINDOW_XID (context->dest_window)));
       g_object_unref (context->dest_window);
       context->dest_window = NULL;
     }
@@ -2653,7 +2653,7 @@ xdnd_read_actions (GdkDragContext *context)
       gdk_error_trap_push ();
       
       if (XGetWindowProperty (GDK_DISPLAY_XDISPLAY (display),
-			      GDK_DRAWABLE_XID (context->source_window),
+			      GDK_WINDOW_XID (context->source_window),
 			      gdk_x11_get_xatom_by_name_for_display (display, "XdndActionList"),
 			      0, 65536,
 			      False, XA_ATOM, &type, &format, &nitems,
@@ -2701,8 +2701,8 @@ xdnd_read_actions (GdkDragContext *context)
       GdkDragContext *source_context;
 
       source_context = gdk_drag_context_find (display, TRUE,
-					      GDK_DRAWABLE_XID (context->source_window),
-					      GDK_DRAWABLE_XID (context->dest_window));
+					      GDK_WINDOW_XID (context->source_window),
+					      GDK_WINDOW_XID (context->dest_window));
 
       if (source_context)
 	{
@@ -2902,7 +2902,7 @@ xdnd_enter_filter (GdkXEvent *xev,
   if (get_types)
     {
       gdk_error_trap_push ();
-      XGetWindowProperty (GDK_DRAWABLE_XDISPLAY (event->any.window), 
+      XGetWindowProperty (GDK_WINDOW_XDISPLAY (event->any.window), 
 			  source_window, 
 			  gdk_x11_get_xatom_by_name_for_display (display, "XdndTypeList"),
 			  0, 65536,
@@ -2982,7 +2982,7 @@ xdnd_leave_filter (GdkXEvent *xev,
 
   if ((display_x11->current_dest_drag != NULL) &&
       (display_x11->current_dest_drag->protocol == GDK_DRAG_PROTO_XDND) &&
-      (GDK_DRAWABLE_XID (display_x11->current_dest_drag->source_window) == source_window))
+      (GDK_WINDOW_XID (display_x11->current_dest_drag->source_window) == source_window))
     {
       event->dnd.type = GDK_DRAG_LEAVE;
       /* Pass ownership of context to the event */
@@ -3027,7 +3027,7 @@ xdnd_position_filter (GdkXEvent *xev,
 
   if ((display_x11->current_dest_drag != NULL) &&
       (display_x11->current_dest_drag->protocol == GDK_DRAG_PROTO_XDND) &&
-      (GDK_DRAWABLE_XID (display_x11->current_dest_drag->source_window) == source_window))
+      (GDK_WINDOW_XID (display_x11->current_dest_drag->source_window) == source_window))
     {
       event->dnd.type = GDK_DRAG_MOTION;
       event->dnd.context = display_x11->current_dest_drag;
@@ -3079,7 +3079,7 @@ xdnd_drop_filter (GdkXEvent *xev,
 
   if ((display_x11->current_dest_drag != NULL) &&
       (display_x11->current_dest_drag->protocol == GDK_DRAG_PROTO_XDND) &&
-      (GDK_DRAWABLE_XID (display_x11->current_dest_drag->source_window) == source_window))
+      (GDK_WINDOW_XID (display_x11->current_dest_drag->source_window) == source_window))
     {
       GdkDragContextPrivateX11 *private;
       private = PRIVATE_DATA (display_x11->current_dest_drag);
@@ -3385,7 +3385,7 @@ gdk_drag_find_window_for_screen (GdkDragContext  *context,
 
   dest = get_client_window_at_coords (window_cache,
 				      drag_window && GDK_WINDOW_IS_X11 (drag_window) ? 
-				      GDK_DRAWABLE_XID (drag_window) : None,
+				      GDK_WINDOW_XID (drag_window) : None,
 				      x_root, y_root);
 
   if (private->dest_xid != dest)
@@ -3477,7 +3477,7 @@ gdk_drag_motion (GdkDragContext *context,
 	  GdkDisplay *display = GDK_WINDOW_DISPLAY (dest_window);
 	  
 	  xdnd_check_dest (display, 
-			   GDK_DRAWABLE_XID (dest_window), 
+			   GDK_WINDOW_XID (dest_window), 
 			   &private->version);
 	}
     }
@@ -3497,8 +3497,8 @@ gdk_drag_motion (GdkDragContext *context,
 	      GdkDragContext *dest_context;
 		    
 	      dest_context = gdk_drag_context_find (display, FALSE,
-						    GDK_DRAWABLE_XID (context->source_window),
-						    GDK_DRAWABLE_XID (dest_window));
+						    GDK_WINDOW_XID (context->source_window),
+						    GDK_WINDOW_XID (dest_window));
 
 	      if (dest_context)
 		{
@@ -3732,7 +3732,7 @@ gdk_drag_status (GdkDragContext   *context,
       xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display,
 									"_MOTIF_DRAG_AND_DROP_MESSAGE");
       xev.xclient.format = 8;
-      xev.xclient.window = GDK_DRAWABLE_XID (context->source_window);
+      xev.xclient.window = GDK_WINDOW_XID (context->source_window);
 
       if (private->drag_status == GDK_DRAG_STATUS_ACTION_WAIT)
 	{
@@ -3794,20 +3794,20 @@ gdk_drag_status (GdkDragContext   *context,
       MOTIF_XCLIENT_LONG (&xev, 4) = 0;
 
       if (!_gdk_send_xevent (display,
-			     GDK_DRAWABLE_XID (context->source_window),
+			     GDK_WINDOW_XID (context->source_window),
 			     FALSE, 0, &xev))
 	GDK_NOTE (DND, 
 		  g_message ("Send event to %lx failed",
-			     GDK_DRAWABLE_XID (context->source_window)));
+			     GDK_WINDOW_XID (context->source_window)));
     }
   else if (context->protocol == GDK_DRAG_PROTO_XDND)
     {
       xev.xclient.type = ClientMessage;
       xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "XdndStatus");
       xev.xclient.format = 32;
-      xev.xclient.window = GDK_DRAWABLE_XID (context->source_window);
+      xev.xclient.window = GDK_WINDOW_XID (context->source_window);
 
-      xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->dest_window);
+      xev.xclient.data.l[0] = GDK_WINDOW_XID (context->dest_window);
       xev.xclient.data.l[1] = (action != 0) ? (2 | 1) : 0;
       xev.xclient.data.l[2] = 0;
       xev.xclient.data.l[3] = 0;
@@ -3817,7 +3817,7 @@ gdk_drag_status (GdkDragContext   *context,
 			     FALSE, &xev))
 	GDK_NOTE (DND, 
 		  g_message ("Send event to %lx failed",
-			     GDK_DRAWABLE_XID (context->source_window)));
+			     GDK_WINDOW_XID (context->source_window)));
     }
 
   private->old_action = action;
@@ -3874,7 +3874,7 @@ gdk_drop_reply (GdkDragContext   *context,
       MOTIF_XCLIENT_LONG (&xev, 4) = 0;
       
       _gdk_send_xevent (display,
-			GDK_DRAWABLE_XID (context->source_window),
+			GDK_WINDOW_XID (context->source_window),
 			FALSE, 0, &xev);
     }
 }
@@ -3904,9 +3904,9 @@ gdk_drop_finish (GdkDragContext   *context,
       xev.xclient.type = ClientMessage;
       xev.xclient.message_type = gdk_x11_get_xatom_by_name_for_display (display, "XdndFinished");
       xev.xclient.format = 32;
-      xev.xclient.window = GDK_DRAWABLE_XID (context->source_window);
+      xev.xclient.window = GDK_WINDOW_XID (context->source_window);
       
-      xev.xclient.data.l[0] = GDK_DRAWABLE_XID (context->dest_window);
+      xev.xclient.data.l[0] = GDK_WINDOW_XID (context->dest_window);
       if (success)
 	{
 	  xev.xclient.data.l[1] = 1;
@@ -3925,7 +3925,7 @@ gdk_drop_finish (GdkDragContext   *context,
 			     FALSE, &xev))
 	GDK_NOTE (DND, 
 		  g_message ("Send event to %lx failed",
-			     GDK_DRAWABLE_XID (context->source_window)));
+			     GDK_WINDOW_XID (context->source_window)));
     }
 }
 
@@ -3969,7 +3969,7 @@ gdk_window_register_dnd (GdkWindow      *window)
   info.num_drop_sites = 0;
   info.total_size = sizeof(info);
 
-  XChangeProperty (GDK_DISPLAY_XDISPLAY (display), GDK_DRAWABLE_XID (window),
+  XChangeProperty (GDK_DISPLAY_XDISPLAY (display), GDK_WINDOW_XID (window),
 		   motif_drag_receiver_info_atom,
 		   motif_drag_receiver_info_atom,
 		   8, PropModeReplace,
@@ -3980,7 +3980,7 @@ gdk_window_register_dnd (GdkWindow      *window)
 
   /* The property needs to be of type XA_ATOM, not XA_INTEGER. Blech */
   XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
-		   GDK_DRAWABLE_XID (window),
+		   GDK_WINDOW_XID (window),
 		   gdk_x11_get_xatom_by_name_for_display (display, "XdndAware"),
 		   XA_ATOM, 32, PropModeReplace,
 		   (guchar *)&xdnd_version, 1);
diff --git a/gdk/x11/gdkselection-x11.c b/gdk/x11/gdkselection-x11.c
index c9b71ab..08b1f55 100644
--- a/gdk/x11/gdkselection-x11.c
+++ b/gdk/x11/gdkselection-x11.c
@@ -86,7 +86,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);
@@ -294,8 +294,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,
diff --git a/gdk/x11/gdktestutils-x11.c b/gdk/x11/gdktestutils-x11.c
index b29fa01..52ffd19 100644
--- a/gdk/x11/gdktestutils-x11.c
+++ b/gdk/x11/gdktestutils-x11.c
@@ -117,7 +117,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;
@@ -224,7 +224,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;
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index c3135d4..7ec5206 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -305,8 +305,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
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]