diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c
index 63d3cbe77b..bdcb265074 100644
--- a/gtk/gtkaboutdialog.c
+++ b/gtk/gtkaboutdialog.c
@@ -1934,7 +1934,7 @@ text_view_visibility_notify_event (GtkWidget          *text_view,
   GList *devices, *d;
   gint wx, wy, bx, by;
 
-  display = gdk_drawable_get_display (event->window);
+  display = gdk_window_get_display (event->window);
   device_manager = gdk_display_get_device_manager (display);
   devices = gdk_device_manager_list_devices (device_manager, GDK_DEVICE_TYPE_MASTER);
 
diff --git a/gtk/gtkclipboard.c b/gtk/gtkclipboard.c
index 5fb0a6ae93..e286d43b3a 100644
--- a/gtk/gtkclipboard.c
+++ b/gtk/gtkclipboard.c
@@ -1905,7 +1905,7 @@ _gtk_clipboard_handle_event (GdkEventOwnerChange *event)
   GdkDisplay *display;
   GtkClipboard *clipboard;
   
-  display = gdk_drawable_get_display (event->window);
+  display = gdk_window_get_display (event->window);
   clipboard = clipboard_peek (display, event->selection, TRUE);
       
   if (clipboard)
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 9a7ab20dfc..55c483c4cf 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -3153,7 +3153,7 @@ set_icon_stock_pixbuf (GdkDragContext    *context,
   else
     g_object_ref (pixbuf);
 
-  display = gdk_drawable_get_display (context->source_window);
+  display = gdk_window_get_display (context->source_window);
   width = gdk_pixbuf_get_width (pixbuf);
   height = gdk_pixbuf_get_height (pixbuf);
 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 32f06b0b86..955bf2d6dd 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -4053,7 +4053,7 @@ set_invisible_cursor (GdkWindow *window)
   GdkDisplay *display;
   GdkCursor *cursor;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   cursor = gdk_cursor_new_for_display (display, GDK_BLANK_CURSOR);
 
   gdk_window_set_cursor (window, cursor);
diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index e530351828..70f76a66d9 100644
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -912,7 +912,7 @@ set_invisible_mouse_cursor (GdkWindow *window)
   GdkDisplay *display;
   GdkCursor *cursor;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   cursor = gdk_cursor_new_for_display (display, GDK_BLANK_CURSOR);
 
   gdk_window_set_cursor (window, cursor);
diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index 49a8122b54..fec5ddcd3b 100644
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -815,7 +815,7 @@ gtk_hsv_button_release (GtkWidget      *widget,
   } else
     g_assert_not_reached ();
   
-  gdk_display_pointer_ungrab (gdk_drawable_get_display (event->window),
+  gdk_display_pointer_ungrab (gdk_window_get_display (event->window),
 			      event->time);
   return TRUE;
 }
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index ebbbd08d6b..6bdd3cc864 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -777,7 +777,7 @@ is_hex_keyval (guint keyval)
 static guint
 canonical_hex_keyval (GdkEventKey *event)
 {
-  GdkKeymap *keymap = gdk_keymap_get_for_display (gdk_drawable_get_display (event->window));
+  GdkKeymap *keymap = gdk_keymap_get_for_display (gdk_window_get_display (event->window));
   guint keyval;
   guint *keyvals = NULL;
   gint n_vals = 0;
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 97c7157071..116ade7b50 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1521,7 +1521,7 @@ rewrite_event_for_grabs (GdkEvent *event)
     case GDK_PROXIMITY_OUT:
     case GDK_KEY_PRESS:
     case GDK_KEY_RELEASE:
-      display = gdk_drawable_get_display (event->any.window);
+      display = gdk_window_get_display (event->any.window);
       device = gdk_event_get_device (event);
 
       if (!gdk_device_grab_info_libgtk_only (display, device, &grab_window, &owner_events) ||
diff --git a/gtk/gtkplug-x11.c b/gtk/gtkplug-x11.c
index db3831d5e1..48d2818f91 100644
--- a/gtk/gtkplug-x11.c
+++ b/gtk/gtkplug-x11.c
@@ -136,7 +136,7 @@ static void
 xembed_set_info (GdkWindow     *window,
 		 unsigned long  flags)
 {
-  GdkDisplay *display = gdk_drawable_get_display (window);
+  GdkDisplay *display = gdk_window_get_display (window);
   unsigned long buffer[2];
 
   Atom xembed_info_atom = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED_INFO");
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 38fa67f337..44116bb90c 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -2516,7 +2516,7 @@ _gtk_selection_incr_event (GdkWindow	   *window,
   g_message ("PropertyDelete, property %ld", event->atom);
 #endif
 
-  selection_max_size = GTK_SELECTION_MAX_SIZE (gdk_drawable_get_display (window));  
+  selection_max_size = GTK_SELECTION_MAX_SIZE (gdk_window_get_display (window));  
 
   /* Now find the appropriate ongoing INCR */
   tmp_list = current_incrs;
diff --git a/gtk/gtksocket-x11.c b/gtk/gtksocket-x11.c
index 6866d7437a..8430e7d93a 100644
--- a/gtk/gtksocket-x11.c
+++ b/gtk/gtksocket-x11.c
@@ -295,7 +295,7 @@ xembed_get_info (GdkWindow     *window,
 		 unsigned long *version,
 		 unsigned long *flags)
 {
-  GdkDisplay *display = gdk_drawable_get_display (window);
+  GdkDisplay *display = gdk_window_get_display (window);
   Atom xembed_info_atom = gdk_x11_get_xatom_by_name_for_display (display, "_XEMBED_INFO");
   Atom type;
   int format;
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index c97a77746a..2eae6b1e63 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4214,7 +4214,7 @@ set_invisible_cursor (GdkWindow *window)
   GdkDisplay *display;
   GdkCursor *cursor;
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
   cursor = gdk_cursor_new_for_display (display, GDK_BLANK_CURSOR);
  
   gdk_window_set_cursor (window, cursor);
@@ -8439,7 +8439,7 @@ text_window_realize (GtkTextWindow *win,
       if (gtk_widget_is_sensitive (widget))
         {
           /* I-beam cursor */
-          cursor = gdk_cursor_new_for_display (gdk_drawable_get_display (window),
+          cursor = gdk_cursor_new_for_display (gdk_window_get_display (window),
 					       GDK_XTERM);
           gdk_window_set_cursor (win->bin_window, cursor);
           gdk_cursor_unref (cursor);
diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c
index ab1202ce08..f6fece1251 100644
--- a/gtk/gtktoolitemgroup.c
+++ b/gtk/gtktoolitemgroup.c
@@ -1208,7 +1208,7 @@ gtk_tool_item_group_realize (GtkWidget *widget)
                            &attributes, attributes_mask);
   gtk_widget_set_window (widget, window);
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (gdk_display_supports_composite (display))
     gdk_window_set_composited (window, TRUE);
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index 736de954b4..98ac1d3740 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -627,7 +627,7 @@ gtk_tool_palette_expose_event (GtkWidget      *widget,
 
   window = gtk_widget_get_window (widget);
 
-  display = gdk_drawable_get_display (window);
+  display = gdk_window_get_display (window);
 
   if (!gdk_display_supports_composite (display))
     return FALSE;
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index 758440a764..d05fb22c0b 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -1437,7 +1437,7 @@ _gtk_tooltip_handle_event (GdkEvent *event)
 
   /* Returns coordinates relative to has_tooltip_widget's allocation. */
   has_tooltip_widget = find_topmost_widget_coords_from_event (event, &x, &y);
-  display = gdk_drawable_get_display (event->any.window);
+  display = gdk_window_get_display (event->any.window);
   current_tooltip = g_object_get_data (G_OBJECT (display),
 				       "gdk-display-current-tooltip");
 
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 262bc9fc54..f19b56459d 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3036,7 +3036,7 @@ gtk_tree_view_button_release_column_resize (GtkWidget      *widget,
 
   GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
   gtk_grab_remove (widget);
-  gdk_display_pointer_ungrab (gdk_drawable_get_display (event->window),
+  gdk_display_pointer_ungrab (gdk_window_get_display (event->window),
 			      event->time);
   return TRUE;
 }
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 96f368a967..91835efa94 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1298,7 +1298,7 @@ _gtk_tree_view_column_realize_button (GtkTreeViewColumn *column)
 		     GDK_POINTER_MOTION_HINT_MASK |
 		     GDK_KEY_PRESS_MASK);
   attributes_mask = GDK_WA_CURSOR | GDK_WA_X | GDK_WA_Y;
-  attr.cursor = gdk_cursor_new_for_display (gdk_drawable_get_display (tree_view->priv->header_window),
+  attr.cursor = gdk_cursor_new_for_display (gdk_window_get_display (tree_view->priv->header_window),
 					    GDK_SB_H_DOUBLE_ARROW);
   attr.y = 0;
   attr.width = TREE_VIEW_DRAG_WIDTH;
diff --git a/gtk/gtkxembed.c b/gtk/gtkxembed.c
index 127d0fe7f1..22f2d43905 100644
--- a/gtk/gtkxembed.c
+++ b/gtk/gtkxembed.c
@@ -147,7 +147,7 @@ _gtk_xembed_send_message (GdkWindow        *recipient,
 	  
   g_return_if_fail (GDK_IS_WINDOW (recipient));
 
-  display = gdk_drawable_get_display (recipient);
+  display = gdk_window_get_display (recipient);
   GTK_NOTE (PLUGSOCKET,
 	    g_message ("Sending %s", _gtk_xembed_message_name (message)));