removed gdk_window_get_[screen|display] replaced by gdk_drawable_get_*

modified gdk_keymap_*

39 files changed, 139 insertions, 199 deletions

diff --git a/demos/testpixbuf-drawable.c b/demos/testpixbuf-drawable.c
index cd53c5aff..b1e5191a9 100644
--- a/demos/testpixbuf-drawable.c
+++ b/demos/testpixbuf-drawable.c
@@ -52,7 +52,7 @@ int expose_cb (GtkWidget *drawing_area, GdkEventExpose *evt, gpointer data)
 int configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
 {
    GdkPixbuf *pixbuf;
-   GdkScreen *scr = gdk_window_get_screen (drawing_area->window);
+   GdkScreen *scr = gdk_drawable_get_screen (drawing_area->window);
    
                            
    pixbuf = (GdkPixbuf *) gtk_object_get_data(GTK_OBJECT(drawing_area),   
diff --git a/demos/testpixbuf-save.c b/demos/testpixbuf-save.c
index 14668b5af..fb66e0b78 100644
--- a/demos/testpixbuf-save.c
+++ b/demos/testpixbuf-save.c
@@ -96,7 +96,7 @@ int
 configure_cb (GtkWidget *drawing_area, GdkEventConfigure *evt, gpointer data)
 {
         GdkPixbuf *pixbuf;
-        GdkScreen *scr = gdk_window_get_screen (drawing_area->window);                   
+        GdkScreen *scr = gdk_drawable_get_screen (drawing_area->window);                   
         pixbuf = (GdkPixbuf *) gtk_object_get_data (GTK_OBJECT (drawing_area),   
                                                     "pixbuf");
     
diff --git a/gdk/gdkdrawable.h b/gdk/gdkdrawable.h
index 8857d62dc..ab39ada5b 100644
--- a/gdk/gdkdrawable.h
+++ b/gdk/gdkdrawable.h
@@ -104,8 +104,6 @@ struct _GdkDrawableClass
                           gint	       height);
   
   gint (*get_depth)      (GdkDrawable  *drawable);
-  GdkScreen*	(*get_screen)	(GdkDrawable  *drawable);
-  GdkDisplay*	(*get_display)	(GdkDrawable *drawable);
   void (*get_size)       (GdkDrawable  *drawable,
                           gint         *width,
                           gint         *height);
@@ -113,8 +111,10 @@ struct _GdkDrawableClass
   void (*set_colormap)   (GdkDrawable  *drawable,
                           GdkColormap  *cmap);
 
-  GdkColormap* (*get_colormap) (GdkDrawable *drawable);
-  GdkVisual*   (*get_visual) (GdkDrawable  *drawable);
+  GdkColormap* (*get_colormap)  (GdkDrawable  *drawable);
+  GdkVisual*   (*get_visual)    (GdkDrawable  *drawable);
+  GdkScreen*   (*get_screen)	(GdkDrawable  *drawable);
+  GdkDisplay*  (*get_display)	(GdkDrawable  *drawable);
 
   GdkImage*    (*get_image)  (GdkDrawable  *drawable,
                               gint          x,
diff --git a/gdk/gdkkeys.c b/gdk/gdkkeys.c
index 7946fc7d6..cde7fa8e3 100644
--- a/gdk/gdkkeys.c
+++ b/gdk/gdkkeys.c
@@ -87,7 +87,7 @@ gdk_keymap_finalize (GObject *object)
 }
 
 GdkKeymap*
-gdk_keymap_new (GdkDisplay *display)
+gdk_keymap_get_for_display (GdkDisplay *display)
 {
  GdkKeymap *keymap = g_object_new (gdk_keymap_get_type (), NULL);
  keymap->display = display;
@@ -100,7 +100,7 @@ gdk_keymap_get_default (void)
   static GdkKeymap *keymap = NULL;
 
   if (keymap == NULL)
-    keymap = gdk_keymap_new (gdk_get_default_display ());
+    keymap = gdk_keymap_get_for_display (gdk_get_default_display ());
 
   return keymap;
 }
diff --git a/gdk/gdkkeys.h b/gdk/gdkkeys.h
index 0560ac9ee..c6d53be5f 100644
--- a/gdk/gdkkeys.h
+++ b/gdk/gdkkeys.h
@@ -76,7 +76,7 @@ struct _GdkKeymapClass
 GType gdk_keymap_get_type (void) G_GNUC_CONST;
 
 GdkKeymap* gdk_keymap_get_default (void);
-GdkKeymap* gdk_keymap_new (GdkDisplay * display);
+GdkKeymap* gdk_keymap_get_for_display (GdkDisplay * display);
 
 
 guint    gdk_keymap_lookup_key               (GdkKeymap           *keymap,
diff --git a/gdk/gdkpixbuf-drawable.c b/gdk/gdkpixbuf-drawable.c
index b190eead6..2a1aeef19 100644
--- a/gdk/gdkpixbuf-drawable.c
+++ b/gdk/gdkpixbuf-drawable.c
@@ -1253,8 +1253,8 @@ gdk_pixbuf_get_from_drawable (GdkPixbuf   *dest,
       ret = gdk_window_get_origin (src, &src_xorigin, &src_yorigin);
       g_return_val_if_fail (ret != FALSE, NULL);
 
-      screen_width = gdk_screen_get_width (gdk_window_get_screen(src));
-      screen_height = gdk_screen_get_height (gdk_window_get_screen(src));
+      screen_width = gdk_screen_get_width (gdk_drawable_get_screen(src));
+      screen_height = gdk_screen_get_height (gdk_drawable_get_screen(src));
 
       screen_srcx = src_xorigin + src_x;
       screen_srcy = src_yorigin + src_y;
diff --git a/gdk/gdkrgb.c b/gdk/gdkrgb.c
index d06753de3..afaf8713a 100644
--- a/gdk/gdkrgb.c
+++ b/gdk/gdkrgb.c
@@ -891,21 +891,15 @@ gdk_rgb_xpixel_from_rgb_internal (GdkColormap *colormap,
 
 /* convert an rgb value into an X pixel code */
 gulong
-gdk_rgb_xpixel_from_rgb_for_screen (GdkScreen *screen, guint32 rgb)
+gdk_rgb_xpixel_from_rgb (guint32 rgb)
 {
   guint32 r = rgb & 0xff0000;
   guint32 g = rgb & 0xff00;
   guint32 b = rgb & 0xff;
 
-  return gdk_rgb_xpixel_from_rgb_internal (gdk_rgb_get_colormap_for_screen(screen),
+  return gdk_rgb_xpixel_from_rgb_internal (gdk_rgb_get_colormap_for_screen(gdk_get_default_screen ()),
 					   (r >> 8) + (r >> 16), g + (g >> 8), b + (b << 8));
 }
-gulong
-gdk_rgb_xpixel_from_rgb (guint32 rgb)
-{
-  GDK_NOTE (MULTIHEAD,g_message (" Use gdk_rgb_xpixel_from_rgb_for_screen instead\n"));
-  return gdk_rgb_xpixel_from_rgb_for_screen (gdk_get_default_screen (),rgb);
-}
 
 void
 gdk_rgb_gc_set_foreground (GdkGC *gc, guint32 rgb)
diff --git a/gdk/gdkrgb.h b/gdk/gdkrgb.h
index 8c167b762..7c26d9613 100644
--- a/gdk/gdkrgb.h
+++ b/gdk/gdkrgb.h
@@ -47,8 +47,6 @@ struct _GdkRgbCmap {
 void gdk_rgb_init (void);
 
 gulong gdk_rgb_xpixel_from_rgb   (guint32      rgb) G_GNUC_CONST;
-gulong gdk_rgb_xpixel_from_rgb_for_screen   (GdkScreen *screen,
-					     guint32      rgb) G_GNUC_CONST;
 void   gdk_rgb_gc_set_foreground (GdkGC       *gc,
 				  guint32      rgb);
 void   gdk_rgb_gc_set_background (GdkGC       *gc,
diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c
index 0e296e97f..92fb0a3ab 100644
--- a/gdk/gdkwindow.c
+++ b/gdk/gdkwindow.c
@@ -134,7 +134,7 @@ static void   gdk_window_real_get_size  (GdkDrawable     *drawable,
 static GdkVisual*   gdk_window_real_get_visual   (GdkDrawable *drawable);
 static gint         gdk_window_real_get_depth    (GdkDrawable *drawable);
 static GdkScreen *  gdk_window_real_get_screen   (GdkDrawable *drawable);
-static GdkDisplay * gdk_window_real_get_display   (GdkDrawable *drawable);
+static GdkDisplay * gdk_window_real_get_display  (GdkDrawable *drawable);
 static void         gdk_window_real_set_colormap (GdkDrawable *drawable,
                                              GdkColormap *cmap);
 static GdkColormap* gdk_window_real_get_colormap (GdkDrawable *drawable);
@@ -607,7 +607,7 @@ gboolean
 gdk_window_is_viewable (GdkWindow *window)
 {
   GdkWindowObject *private = (GdkWindowObject *)window;
-  GdkScreen * scr = gdk_window_get_screen (window);
+  GdkScreen * scr = gdk_drawable_get_screen (window);
   GdkWindow * root_window = GDK_SCREEN_GET_CLASS (scr)->get_root_window (scr);
   
   g_return_val_if_fail (window != NULL, FALSE);
@@ -1690,16 +1690,16 @@ static GdkScreen*
 gdk_window_real_get_screen (GdkDrawable *drawable)
 {
   g_return_val_if_fail (GDK_IS_WINDOW (drawable), 0);
-  return gdk_window_get_screen(GDK_WINDOW (drawable));
+  return gdk_drawable_get_screen(GDK_WINDOW_OBJECT (drawable)->impl);
 }
 
 static GdkDisplay*
 gdk_window_real_get_display (GdkDrawable *drawable)
 {
   g_return_val_if_fail (GDK_IS_WINDOW (drawable), 0);
-  return gdk_window_get_display(GDK_WINDOW (drawable));
+  return gdk_drawable_get_display(GDK_WINDOW_OBJECT (drawable)->impl);
 }
-	
+
 
 static void
 gdk_window_real_set_colormap (GdkDrawable *drawable,
@@ -1783,7 +1783,7 @@ gdk_window_process_updates_internal (GdkWindow *window)
           if (debug_updates)
             {
               /* Make sure we see the red invalid area before redrawing. */
-              gdk_display_sync (gdk_window_get_display(window));
+              gdk_display_sync (gdk_drawable_get_display (window));
               g_usleep (70000);
             }
           
@@ -2307,14 +2307,4 @@ gdk_window_constrain_size (GdkGeometry *geometry,
   *new_width = width;
   *new_height = height;
 }
-/**
- * gdk_window_get_display:
- * @window: a #GdkWindow
- *
- * retrieve the GdkDisplay associated with #GdkWindow
- * 
- * 
- * Return value: the #GdkDisplay associated with @window
- **/
-
 
diff --git a/gdk/gdkwindow.h b/gdk/gdkwindow.h
index 6ad1c4193..06a51320b 100644
--- a/gdk/gdkwindow.h
+++ b/gdk/gdkwindow.h
@@ -505,9 +505,6 @@ void       gdk_window_constrain_size      (GdkGeometry  *geometry,
                                            gint         *new_height);
 void	    gdk_window_set_screen	  (GdkWindow	*window,
 					   GdkScreen	*screen);
-GdkScreen * gdk_window_get_screen	  (GdkWindow	*window);
-GdkDisplay* gdk_window_get_display	  (GdkWindow	*window);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/gdk/x11/gdkdnd-x11.c b/gdk/x11/gdkdnd-x11.c
index 11d923d69..d63e115f4 100644
--- a/gdk/x11/gdkdnd-x11.c
+++ b/gdk/x11/gdkdnd-x11.c
@@ -2576,7 +2576,7 @@ xdnd_manage_source_filter (GdkDragContext *context,
 	}
     }
 
-  gdk_display_sync (gdk_window_get_display(window));
+  gdk_display_sync (gdk_drawable_get_display (window));
   gdk_error_trap_pop ();  
 }
 
diff --git a/gdk/x11/gdkdrawable-x11.c b/gdk/x11/gdkdrawable-x11.c
index 37a53e63e..1b08c0cde 100644
--- a/gdk/x11/gdkdrawable-x11.c
+++ b/gdk/x11/gdkdrawable-x11.c
@@ -130,6 +130,8 @@ static gint         gdk_x11_get_depth      (GdkDrawable    *drawable);
 
 static GdkScreen *  gdk_x11_get_screen	   (GdkDrawable    *drawable);
 
+static GdkDisplay*  gdk_x11_get_display	   (GdkDrawable    *drawable);
+
 static GdkVisual*   gdk_x11_get_visual     (GdkDrawable    *drawable);
 
 static void gdk_drawable_impl_x11_class_init (GdkDrawableImplX11Class *klass);
@@ -194,6 +196,7 @@ gdk_drawable_impl_x11_class_init (GdkDrawableImplX11Class *klass)
 
   drawable_class->get_depth = gdk_x11_get_depth;
   drawable_class->get_screen = gdk_x11_get_screen;
+  drawable_class->get_display = gdk_x11_get_display;
   drawable_class->get_visual = gdk_x11_get_visual;
   
   drawable_class->get_image = _gdk_x11_get_image;
@@ -710,10 +713,17 @@ gdk_x11_get_depth (GdkDrawable *drawable)
 }
 
 static GdkScreen*
-gdk_x11_get_screen(GdkDrawable *drawable){
+gdk_x11_get_screen (GdkDrawable *drawable)
+{
   return GDK_DRAWABLE_IMPL_X11 (drawable)->screen;
 }
 
+static GdkDisplay*
+gdk_x11_get_display (GdkDrawable *drawable)
+{
+  return gdk_screen_get_display(GDK_DRAWABLE_IMPL_X11 (drawable)->screen);
+}
+
 static GdkVisual*
 gdk_x11_get_visual (GdkDrawable    *drawable)
 {
diff --git a/gdk/x11/gdkgeometry-x11.c b/gdk/x11/gdkgeometry-x11.c
index 0136f59b9..582e3dd6e 100644
--- a/gdk/x11/gdkgeometry-x11.c
+++ b/gdk/x11/gdkgeometry-x11.c
@@ -714,7 +714,7 @@ _gdk_window_process_expose (GdkWindow    *window,
   GdkRegion *invalidate_region = gdk_region_rectangle (area);
   GdkRegion *clip_region;
   GSList *tmp_list = translate_queue;
-  GdkDisplay *display = gdk_window_get_display(window);
+  GdkDisplay *display = gdk_drawable_get_display (window);
 
   impl = GDK_WINDOW_IMPL_X11 (GDK_WINDOW_OBJECT (window)->impl);
   
diff --git a/gdk/x11/gdkinput-x11.c b/gdk/x11/gdkinput-x11.c
index 3507a07e4..04a7ebcc3 100644
--- a/gdk/x11/gdkinput-x11.c
+++ b/gdk/x11/gdkinput-x11.c
@@ -448,8 +448,8 @@ gdk_input_translate_coordinates (GdkDevicePrivate *gdkdev,
 
   if (gdkdev->info.mode == GDK_MODE_SCREEN) 
     {
-      x_scale = gdk_screen_get_width (gdk_window_get_screen (input_window->window)) / device_width;
-      y_scale = gdk_screen_get_height (gdk_window_get_screen (input_window->window)) / device_height;
+      x_scale = gdk_screen_get_width (gdk_drawable_get_screen (input_window->window)) / device_width;
+      y_scale = gdk_screen_get_height (gdk_drawable_get_screen (input_window->window)) / device_height;
 
       x_offset = - input_window->root_x;
       y_offset = - input_window->root_y;
diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index 4e4f07614..25e47a864 100644
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -1564,7 +1564,7 @@ set_text_property (GdkWindow   *window,
     }
   else
     {
-      gdk_utf8_to_compound_text_for_display (gdk_window_get_display(window),
+      gdk_utf8_to_compound_text_for_display (gdk_drawable_get_display (window),
       	      utf8_str, &prop_type, &prop_format, &prop_text, &prop_length);
     }
 
@@ -3927,15 +3927,4 @@ void gdk_window_set_screen (GdkWindow *window, GdkScreen *screen)
   draw_impl->screen = screen;
 }
 
-GdkScreen*
-gdk_window_get_screen (GdkWindow *window)
-{
-    return GDK_WINDOW_SCREEN (window);
-}
-
-GdkDisplay* 
-gdk_window_get_display (GdkWindow *window)
-{
-    return GDK_WINDOW_DISPLAY (window);
-}
 
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 75cae4746..7e6cc130b 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1071,8 +1071,8 @@ gtk_button_finish_activate (GtkButton *button,
   g_source_remove (button->activate_timeout);
   button->activate_timeout = 0;
 
-  gdk_display_keyboard_ungrab(gdk_window_get_display(widget->window),
-				  gtk_get_current_event_time ());
+  gdk_display_keyboard_ungrab(gtk_widget_get_display (widget),
+			      gtk_get_current_event_time ());
   gtk_grab_remove (widget);
 
   button->button_down = FALSE;
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index f592ff903..c73838876 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -1878,9 +1878,8 @@ abort_column_resize (GtkCList *clist)
 
   GTK_CLIST_UNSET_FLAG (clist, CLIST_IN_DRAG);
   gtk_grab_remove (GTK_WIDGET (clist));
-  gdk_display_pointer_ungrab (
-		      gdk_window_get_display(GTK_WIDGET(clist)->window),
-		      GDK_CURRENT_TIME);
+  gdk_display_pointer_ungrab (gtk_widget_get_display (clist),
+			      GDK_CURRENT_TIME);
   clist->drag_pos = -1;
 
   if (clist->x_drag >= 0 && clist->x_drag <= clist->clist_window_width - 1)
@@ -3614,8 +3613,7 @@ toggle_focus_row (GtkCList *clist)
   g_return_if_fail (clist != 0);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if ((gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
+  if ((gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) && 
       GTK_WIDGET_HAS_GRAB (clist)) ||
       clist->focus_row < 0 || 
       clist->focus_row >= clist->rows)
@@ -3655,8 +3653,7 @@ toggle_add_mode (GtkCList *clist)
   g_return_if_fail (clist != 0);
   g_return_if_fail (GTK_IS_CLIST (clist));
   
-  if ((gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) &&
+  if ((gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) &&
       GTK_WIDGET_HAS_GRAB (clist)) ||
       clist->selection_mode != GTK_SELECTION_EXTENDED)
     return;
@@ -3785,8 +3782,7 @@ real_select_all (GtkCList *clist)
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if (gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) && 
       GTK_WIDGET_HAS_GRAB (clist))
     return;
 
@@ -3835,8 +3831,7 @@ real_unselect_all (GtkCList *clist)
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if (gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) && 
       GTK_WIDGET_HAS_GRAB (clist))
     return;
 
@@ -3923,8 +3918,7 @@ real_undo_selection (GtkCList *clist)
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if ((gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
+  if ((gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) && 
        GTK_WIDGET_HAS_GRAB (clist)) ||
       clist->selection_mode != GTK_SELECTION_EXTENDED)
     return;
@@ -4279,8 +4273,7 @@ start_selection (GtkCList *clist)
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if (gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) && 
       GTK_WIDGET_HAS_GRAB (clist))
     return;
 
@@ -4294,8 +4287,7 @@ end_selection (GtkCList *clist)
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if (gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) &&
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) &&
       GTK_WIDGET_HAS_FOCUS (clist))
     return;
 
@@ -4311,8 +4303,7 @@ extend_selection (GtkCList      *clist,
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if ((gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) &&
+  if ((gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) &&
        GTK_WIDGET_HAS_GRAB (clist)) ||
       clist->selection_mode != GTK_SELECTION_EXTENDED)
     return;
@@ -4752,9 +4743,8 @@ gtk_clist_unmap (GtkWidget *widget)
     {
       GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
 
-      if (gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
-	 GTK_WIDGET_HAS_GRAB (clist))
+      if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) && 
+	  GTK_WIDGET_HAS_GRAB (clist))
 	{
 	  remove_grab (clist);
 
@@ -5134,8 +5124,8 @@ gtk_clist_button_release (GtkWidget      *widget,
       GTK_CLIST_UNSET_FLAG (clist, CLIST_IN_DRAG);
       gtk_widget_get_pointer (widget, &x, NULL);
       gtk_grab_remove (widget);
-      gdk_display_pointer_ungrab (gdk_window_get_display(widget->window),
-				      event->time);
+      gdk_display_pointer_ungrab (gtk_widget_get_display (widget),
+				  event->time);
 
       if (clist->x_drag >= 0)
 	draw_xor_line (clist);
@@ -5212,8 +5202,7 @@ gtk_clist_motion (GtkWidget      *widget,
   g_return_val_if_fail (GTK_IS_CLIST (widget), FALSE);
 
   clist = GTK_CLIST (widget);
-  if (!(gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) &&
+  if (!(gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) &&
 	GTK_WIDGET_HAS_GRAB (clist)))
     return FALSE;
 
@@ -6843,8 +6832,7 @@ scroll_horizontal (GtkCList      *clist,
   g_return_if_fail (clist != 0);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if (gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) && 
       GTK_WIDGET_HAS_GRAB (clist))
     return;
 
@@ -6920,8 +6908,7 @@ scroll_vertical (GtkCList      *clist,
   g_return_if_fail (clist != NULL);
   g_return_if_fail (GTK_IS_CLIST (clist));
 
-  if (gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) && 
       GTK_WIDGET_HAS_GRAB (clist))
     return;
 
@@ -7096,11 +7083,9 @@ remove_grab (GtkCList *clist)
   if (GTK_WIDGET_HAS_GRAB (clist))
     {
       gtk_grab_remove (GTK_WIDGET (clist));
-      if (gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)))
-	gdk_display_pointer_ungrab (
-	     gdk_window_get_display(GTK_WIDGET(clist)->window),
-	     GDK_CURRENT_TIME);
+      if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)))
+	gdk_display_pointer_ungrab (gtk_widget_get_display (clist),
+				    GDK_CURRENT_TIME);
     }
 
   if (clist->htimer)
@@ -7244,8 +7229,7 @@ real_sort_list (GtkCList *clist)
   if (clist->rows <= 1)
     return;
 
-  if (gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) &&
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) &&
       GTK_WIDGET_HAS_GRAB (clist))
     return;
 
@@ -7839,8 +7823,7 @@ gtk_clist_set_button_actions (GtkCList *clist,
   
   if (button < MAX_BUTTON)
     {
-      if (gdk_display_pointer_is_grabbed (
-	    gdk_window_get_display(GTK_WIDGET(clist)->window)) || 
+      if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) || 
 	  GTK_WIDGET_HAS_GRAB (clist))
 	{
 	  remove_grab (clist);
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 3cbaa591d..05ed91a6a 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -1112,10 +1112,10 @@ shutdown_eyedropper (GtkWidget *widget)
   colorsel = GTK_COLOR_SELECTION (widget);
   priv = colorsel->private_data;    
 
-  gdk_display_keyboard_ungrab (gdk_window_get_display(widget->window),
-				   gtk_get_current_event_time ());
-  gdk_display_pointer_ungrab (gdk_window_get_display(widget->window),
-				  gtk_get_current_event_time ());
+  gdk_display_keyboard_ungrab (gtk_widget_get_display(widget),
+			       gtk_get_current_event_time ());
+  gdk_display_pointer_ungrab (gtk_widget_get_display(widget),
+			      gtk_get_current_event_time ());
   gtk_grab_remove (priv->dropper_grab_widget);
 }
 
@@ -1246,7 +1246,7 @@ get_screen_color (GtkWidget *button)
                         picker_cursor,
                         gtk_get_current_event_time ()) != GDK_GRAB_SUCCESS)
     {
-      gdk_display_keyboard_ungrab (gdk_window_get_display (button->window),GDK_CURRENT_TIME);
+      gdk_display_keyboard_ungrab (gtk_widget_get_display (button),GDK_CURRENT_TIME);
       g_warning ("Failed to grab pointer to do eyedropper");
       return;
     }
diff --git a/gtk/gtkcombo.c b/gtk/gtkcombo.c
index 3da46a341..b2aef1ba0 100644
--- a/gtk/gtkcombo.c
+++ b/gtk/gtkcombo.c
@@ -269,9 +269,8 @@ gtk_combo_window_key_press (GtkWidget   *window,
 	  if (GTK_WIDGET_HAS_GRAB (combo->popwin))
 	    {
 	      gtk_grab_remove (combo->popwin);
-	      gdk_display_pointer_ungrab (
-			gdk_window_get_display(window->window),
-			event->time);
+	      gdk_display_pointer_ungrab (gtk_widget_get_display(window),
+					  event->time);
 	    }
 	}
 
@@ -593,8 +592,8 @@ gtk_combo_button_press (GtkWidget * widget, GdkEvent * event, GtkCombo * combo)
 
   gtk_widget_hide (combo->popwin);
   gtk_grab_remove (combo->popwin);
-  gdk_display_pointer_ungrab (gdk_window_get_display(widget->window),
-				  event->button.time);
+  gdk_display_pointer_ungrab (gtk_widget_get_display(widget),
+			      event->button.time);
 
   return TRUE;
 }
@@ -662,9 +661,8 @@ gtk_combo_button_release (GtkWidget *widget,
       if (GTK_WIDGET_HAS_GRAB (combo->popwin))
 	{
 	  gtk_grab_remove (combo->popwin);
-	  gdk_display_pointer_ungrab (
-		gdk_window_get_display(combo->button->window),
-		event->button.time);
+	  gdk_display_pointer_ungrab (gtk_widget_get_display(combo),
+				      event->button.time);
 	}
     }
   
@@ -723,8 +721,8 @@ gtk_combo_list_key_press (GtkWidget * widget, GdkEventKey * event, GtkCombo * co
       if (GTK_WIDGET_HAS_GRAB (combo->popwin))
 	{
 	  gtk_grab_remove (combo->popwin);
-	  gdk_display_pointer_ungrab (gdk_window_get_display(widget->window),
-					  GDK_CURRENT_TIME);
+	  gdk_display_pointer_ungrab (gtk_widget_get_display(widget),
+				      GDK_CURRENT_TIME);
 	}
       else if (GTK_WIDGET_HAS_GRAB (combo->list))
 	gtk_list_end_drag_selection (GTK_LIST (combo->list));
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index ad414a457..511cc6b21 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -2478,8 +2478,7 @@ change_focus_row_expansion (GtkCTree          *ctree,
 
   clist = GTK_CLIST (ctree);
 
-  if (gdk_display_pointer_is_grabbed (
-		gdk_window_get_display(GTK_WIDGET(ctree)->window)) && 
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (ctree)) && 
       GTK_WIDGET_HAS_GRAB (ctree))
     return;
   
@@ -4815,14 +4814,12 @@ gtk_ctree_node_set_shift (GtkCTree     *ctree,
 static void
 remove_grab (GtkCList *clist)
 {
-  if (gdk_display_pointer_is_grabbed (
-		gdk_window_get_display(GTK_WIDGET(clist)->window)) && 
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (clist)) && 
       GTK_WIDGET_HAS_GRAB (clist))
     {
       gtk_grab_remove (GTK_WIDGET (clist));
-      gdk_display_pointer_ungrab (
-		      gdk_window_get_display(GTK_WIDGET(clist)->window),
-		      GDK_CURRENT_TIME);
+      gdk_display_pointer_ungrab (gtk_widget_get_display (clist),
+				  GDK_CURRENT_TIME);
     }
 
   if (clist->htimer)
diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index 45dad6d07..2beb425e0 100644
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -703,7 +703,7 @@ gtk_drag_finish (GdkDragContext *context,
 		 guint32         time)
 {
   GdkAtom target = GDK_NONE;
-  GdkDisplay *display = gdk_window_get_display (context->source_window);
+  GdkDisplay *display = gdk_drawable_get_display  (context->source_window);
 
   g_return_if_fail (context != NULL);
 
@@ -2128,7 +2128,7 @@ gtk_drag_set_icon_default (GdkDragContext    *context)
   if (!default_icon_pixmap)
     {
       default_icon_colormap = gdk_colormap_get_system_for_screen (
-			      gdk_window_get_screen(context->source_window));
+			      gdk_drawable_get_screen(context->source_window));
       default_icon_pixmap = 
 	gdk_pixmap_colormap_create_from_xpm_d (NULL,
 					       default_icon_colormap,
@@ -2412,8 +2412,8 @@ gtk_drag_source_release_selections (GtkDragSourceInfo *info,
   while (tmp_list)
     {
       GdkAtom selection = GPOINTER_TO_UINT (tmp_list->data);
-      if (gdk_selection_owner_get_for_display (gdk_window_get_display(info->ipc_widget->window), selection) == info->ipc_widget->window)
-	gtk_selection_owner_set_for_display (gdk_window_get_display(info->ipc_widget->window), NULL, selection, time);
+      if (gdk_selection_owner_get_for_display (gtk_widget_get_display (info->widget), selection) == info->ipc_widget->window)
+	gtk_selection_owner_set_for_display (gtk_widget_get_display (info->widget), NULL, selection, time);
 
       tmp_list = tmp_list->next;
     }
@@ -2809,12 +2809,12 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time)
 {
   GdkEvent send_event;
   GtkWidget *source_widget = info->widget;
-  GdkWindow *root_window = gdk_screen_get_root_window (source_widget->screen);
+  GdkWindow *root_window = gdk_screen_get_root_window (source_widget);
 
-  gdk_display_pointer_ungrab (gdk_window_get_display(source_widget->window),
-				  time);
-  gdk_display_keyboard_ungrab (gdk_window_get_display (source_widget->window),
-				  time);
+  gdk_display_pointer_ungrab (gtk_widget_get_display (source_widget),
+			      time);
+  gdk_display_keyboard_ungrab (gtk_widget_get_display (source_widget),
+			       time);
   gtk_grab_remove (info->ipc_widget);
 
   gtk_signal_disconnect_by_func (GTK_OBJECT (info->ipc_widget), 
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index e086af721..725b80108 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1736,7 +1736,7 @@ gtk_entry_real_insert_text (GtkEntry    *entry,
   n_chars = g_utf8_strlen (new_text, new_text_length);
   if (entry->text_max_length > 0 && n_chars + entry->text_length > entry->text_max_length)
     {
-      gdk_display_beep (gdk_window_get_display(GTK_WIDGET(entry)->window));
+      gdk_display_beep (gtk_widget_get_display (entry));
       n_chars = entry->text_max_length - entry->text_length;
       new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
     }
diff --git a/gtk/gtkfilesel.c b/gtk/gtkfilesel.c
index 2d45147c9..fdd651ea6 100644
--- a/gtk/gtkfilesel.c
+++ b/gtk/gtkfilesel.c
@@ -1395,7 +1395,7 @@ gtk_file_selection_insert_text (GtkWidget   *widget,
 
   if (!filename)
     {
-      gdk_display_beep (gdk_window_get_display(widget->window));
+      gdk_display_beep (gtk_widget_get_display (widget));
       gtk_signal_emit_stop_by_name (GTK_OBJECT (widget), "insert_text");
       return FALSE;
     }
diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 4c7110ec8..f64c413ef 100644
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -999,7 +999,7 @@ gtk_handle_box_button_changed (GtkWidget      *widget,
       if (event->window != widget->window)
 	return FALSE;
       
-      gdk_display_pointer_ungrab (gdk_window_get_display(event->window),
+      gdk_display_pointer_ungrab (gdk_drawable_get_display (event->window),
 				      GDK_CURRENT_TIME);
       hb->in_drag = FALSE;
       event_handled = TRUE;
@@ -1170,9 +1170,9 @@ gtk_handle_box_motion (GtkWidget      *widget,
 	  /* this extra move is neccessary if we use decorations, or our
 	   * window manager insists on decorations.
 	   */
-	  gdk_display_sync (gdk_window_get_display(hb->float_window));
+	  gdk_display_sync (gtk_widget_get_display (hb));
 	  gdk_window_move (hb->float_window, new_x, new_y);
-	  gdk_display_sync (gdk_window_get_display(hb->float_window));
+	  gdk_display_sync (gtk_widget_get_display (hb));
 #endif	/* 0 */
 	  gtk_signal_emit (GTK_OBJECT (hb),
 			   handle_box_signals[SIGNAL_CHILD_DETACHED],
@@ -1253,9 +1253,8 @@ gtk_handle_box_reattach (GtkHandleBox *hb)
     }
   if (hb->in_drag)
     {
-      gdk_display_pointer_ungrab (
-		      gdk_window_get_display(GTK_WIDGET(hb)->window),
-		      GDK_CURRENT_TIME);
+      gdk_display_pointer_ungrab (gtk_widget_get_display (hb), 
+				  GDK_CURRENT_TIME);
       hb->in_drag = FALSE;
     }
 
diff --git a/gtk/gtkhpaned.c b/gtk/gtkhpaned.c
index 8f84511e5..37ef4055e 100644
--- a/gtk/gtkhpaned.c
+++ b/gtk/gtkhpaned.c
@@ -362,8 +362,8 @@ gtk_hpaned_button_release (GtkWidget      *widget,
       gtk_hpaned_xor_line (paned);
       paned->in_drag = FALSE;
       paned->position_set = TRUE;
-      gdk_display_pointer_ungrab (gdk_window_get_display(widget->window),
-				      event->time);
+      gdk_display_pointer_ungrab (gtk_widget_get_display (widget),
+				  event->time);
       gtk_widget_queue_resize (GTK_WIDGET (paned));
       g_object_freeze_notify (object);
       g_object_notify (object, "position");
diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index 1517a9792..139c5b303 100644
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -856,7 +856,7 @@ gtk_hsv_button_release (GtkWidget      *widget,
   } else
     g_assert_not_reached ();
   
-  gdk_display_pointer_ungrab (gdk_window_get_display(event->window),
+  gdk_display_pointer_ungrab (gdk_drawable_get_display (event->window),
 				  event->time);
   return TRUE;
 }
diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index 3a26c3812..849e94f93 100644
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -1035,7 +1035,7 @@ no_sequence_matches (GtkIMContextSimple *context_simple,
       context_simple->compose_buffer[0] = 0;
       if (n_compose > 1)		/* Invalid sequence */
 	{
-	  gdk_display_beep (gdk_window_get_display(event->window));
+	  gdk_display_beep (gdk_drawable_get_display (event->window));
 	  return TRUE;
 	}
   
@@ -1073,7 +1073,7 @@ canonical_hex_keyval (GdkEventKey *event)
   /* See if this key would have generated a hex keyval in
    * any other state, and return that hex keyval if so
    */
-  gdk_keymap_get_entries_for_keycode (gdk_keymap_new (gdk_window_get_display (event->window)),
+  gdk_keymap_get_entries_for_keycode (gdk_keymap_get_for_display (gdk_drawable_get_display  (event->window)),
 				     event->hardware_keycode,
 				     NULL,
 				     &keyvals, &n_vals);
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 984f1eb61..1bbc7a1e2 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -468,7 +468,7 @@ gtk_label_mnemonic_activate (GtkWidget *widget,
 
   /* barf if there was nothing to activate */
   g_warning ("Couldn't find a target for a mnemonic activation.");
-  gdk_display_beep (gdk_window_get_display(widget->window));
+  gdk_display_beep (gtk_widget_get_display (widget));
   
   return FALSE;
 }
diff --git a/gtk/gtklist.c b/gtk/gtklist.c
index 564052816..f67094238 100644
--- a/gtk/gtklist.c
+++ b/gtk/gtklist.c
@@ -524,8 +524,7 @@ gtk_list_unmap (GtkWidget *widget)
 
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_MAPPED);
 
-  if (gdk_display_pointer_is_grabbed (
-			  gdk_window_get_display(widget->window)) &&
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (widget->window)) &&
       GTK_WIDGET_HAS_GRAB (list))
     {
       gtk_list_end_drag_selection (list);
@@ -680,7 +679,7 @@ gtk_list_button_press (GtkWidget      *widget,
 	  list->drag_selection = TRUE;
 	}
       else if (gdk_display_pointer_is_grabbed (
-			  gdk_window_get_display(widget->window)) && 
+			  gtk_widget_get_display (widget)) && 
 	       GTK_WIDGET_HAS_GRAB (list))
 	gtk_list_end_drag_selection (list);
 	  
@@ -1516,8 +1515,7 @@ gtk_list_select_all (GtkList *list)
   if (!list->children)
     return;
   
-  if (gdk_display_pointer_is_grabbed (
-	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (list)) && 
       GTK_WIDGET_HAS_GRAB (list))
     gtk_list_end_drag_selection (list);
 
@@ -1577,8 +1575,7 @@ gtk_list_unselect_all (GtkList *list)
   if (!list->children)
     return;
 
-  if (gdk_display_pointer_is_grabbed (
-	  gdk_window_get_display(GTK_WIDGET(list)->window)) &&
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (list)) &&
       GTK_WIDGET_HAS_GRAB (list))
     gtk_list_end_drag_selection (list);
 
@@ -1624,8 +1621,7 @@ gtk_list_extend_selection (GtkList       *list,
   g_return_if_fail (list != NULL);
   g_return_if_fail (GTK_IS_LIST (list));
 
-  if ((gdk_display_pointer_is_grabbed (
-	  gdk_window_get_display(GTK_WIDGET(list)->window)) &&
+  if ((gdk_display_pointer_is_grabbed (gtk_widget_get_display (list)) &&
       GTK_WIDGET_HAS_GRAB (list)) ||
       list->selection_mode != GTK_SELECTION_EXTENDED)
     return;
@@ -1679,8 +1675,7 @@ gtk_list_start_selection (GtkList *list)
   g_return_if_fail (list != NULL);
   g_return_if_fail (GTK_IS_LIST (list));
 
-  if (gdk_display_pointer_is_grabbed (
-	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (list)) && 
       GTK_WIDGET_HAS_GRAB (list))
     return;
 
@@ -1705,8 +1700,7 @@ gtk_list_end_selection (GtkList *list)
   g_return_if_fail (list != NULL);
   g_return_if_fail (GTK_IS_LIST (list));
 
-  if ((gdk_display_pointer_is_grabbed (
-	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
+  if ((gdk_display_pointer_is_grabbed (gtk_widget_get_display (list)) && 
        GTK_WIDGET_HAS_GRAB (list)) ||
       list->anchor < 0)
     return;
@@ -1831,8 +1825,7 @@ gtk_list_toggle_focus_row (GtkList *list)
 
   container = GTK_CONTAINER (list);
 
-  if ((gdk_display_pointer_is_grabbed (
-	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
+  if ((gdk_display_pointer_is_grabbed (gtk_widget_get_display (list)) && 
       GTK_WIDGET_HAS_GRAB (list)) ||
       !container->focus_child)
     return;
@@ -1877,8 +1870,7 @@ gtk_list_toggle_add_mode (GtkList *list)
   g_return_if_fail (list != 0);
   g_return_if_fail (GTK_IS_LIST (list));
   
-  if ((gdk_display_pointer_is_grabbed (
-	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
+  if ((gdk_display_pointer_is_grabbed (gtk_widget_get_display (list)) && 
       GTK_WIDGET_HAS_GRAB (list)) ||
       list->selection_mode != GTK_SELECTION_EXTENDED)
     return;
@@ -1906,8 +1898,7 @@ gtk_list_undo_selection (GtkList *list)
   g_return_if_fail (GTK_IS_LIST (list));
 
   if (list->selection_mode != GTK_SELECTION_EXTENDED ||
-      (gdk_display_pointer_is_grabbed (
-	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
+      (gdk_display_pointer_is_grabbed (gtk_widget_get_display (list)) && 
        GTK_WIDGET_HAS_GRAB (list)))
     return;
   
@@ -2189,8 +2180,7 @@ gtk_list_scroll_horizontal (GtkList       *list,
   g_return_if_fail (list != 0);
   g_return_if_fail (GTK_IS_LIST (list));
 
-  if (gdk_display_pointer_is_grabbed (
-	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (list)) && 
       GTK_WIDGET_HAS_GRAB (list))
     return;
 
@@ -2238,8 +2228,7 @@ gtk_list_scroll_vertical (GtkList       *list,
   g_return_if_fail (list != NULL);
   g_return_if_fail (GTK_IS_LIST (list));
 
-  if (gdk_display_pointer_is_grabbed (
-	  gdk_window_get_display(GTK_WIDGET(list)->window)) && 
+  if (gdk_display_pointer_is_grabbed (gtk_widget_get_display (list)) && 
       GTK_WIDGET_HAS_GRAB (list))
     return;
 
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index c5aaa4a61..7a2c5e36f 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -597,7 +597,7 @@ gtk_menu_popup (GtkMenu		    *menu,
 	    GTK_MENU_SHELL (xgrab_shell)->have_xgrab = TRUE;
 	  else
 	    gdk_display_pointer_ungrab (
-		 gdk_window_get_display(xgrab_shell->window),activate_time);
+		 gdk_drawable_get_display (xgrab_shell->window),activate_time);
 	}
     }
 
@@ -655,12 +655,10 @@ gtk_menu_popdown (GtkMenu *menu)
 	   */
 	  if (menu_shell->have_xgrab)
 	    {
-	      gdk_display_pointer_ungrab (
-		     gdk_window_get_display(menu->tearoff_window->window),
-		     GDK_CURRENT_TIME);
-	      gdk_display_keyboard_ungrab (
-		     gdk_window_get_display(menu->tearoff_window->window),
-		     GDK_CURRENT_TIME);
+	      gdk_display_pointer_ungrab (gtk_widget_get_display (menu),
+					  GDK_CURRENT_TIME);
+	      gdk_display_keyboard_ungrab (gtk_widget_get_display (menu),
+					   GDK_CURRENT_TIME);
 	    }
 	}
 
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index 9fceb2edd..c9bf03436 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -757,12 +757,10 @@ gtk_real_menu_shell_deactivate (GtkMenuShell *menu_shell)
       if (menu_shell->have_xgrab)
 	{
 	  menu_shell->have_xgrab = FALSE;
-	  gdk_display_pointer_ungrab (
-		    gdk_window_get_display(GTK_WIDGET (menu_shell)->window),
-		    GDK_CURRENT_TIME);
-	  gdk_display_keyboard_ungrab (
-		    gdk_window_get_display(GTK_WIDGET (menu_shell)->window),
-		    GDK_CURRENT_TIME);
+	  gdk_display_pointer_ungrab (gtk_widget_get_display (menu_shell),
+				      GDK_CURRENT_TIME);
+	  gdk_display_keyboard_ungrab (gtk_widget_get_display (menu_shell),
+				       GDK_CURRENT_TIME);
 	}
     }
 }
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 2ba777d79..209314b79 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -415,9 +415,10 @@ gtk_plug_accel_entries_changed (GtkWindow *window)
 	  GdkKeymapKey *keys;
 	  gint n_keys;
 	  
-	  if (gdk_keymap_get_entries_for_keyval (gdk_keymap_new(gdk_window_get_display(window->window)),
-				      		 entries[i].accelerator_key, 
-				      		 &keys, &n_keys))
+	  if (gdk_keymap_get_entries_for_keyval (
+		  gdk_keymap_get_for_display (gtk_widget_get_display  (window)),
+					      entries[i].accelerator_key, 
+					      &keys, &n_keys))
 	    {
 	      GrabbedKey *key = g_new (GrabbedKey, 1);
 	      
@@ -553,7 +554,7 @@ send_xembed_message (GtkPlug *plug,
 
       xevent.xclient.window = GDK_WINDOW_XWINDOW (plug->socket_window);
       xevent.xclient.type = ClientMessage;
-      xevent.xclient.message_type = gdk_display_atom (gdk_window_get_display(plug->socket_window), "_XEMBED", FALSE);
+      xevent.xclient.message_type = gdk_display_atom (gdk_drawable_get_display (plug->socket_window), "_XEMBED", FALSE);
 
       xevent.xclient.format = 32;
       xevent.xclient.data.l[0] = time;
@@ -706,7 +707,7 @@ gtk_plug_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
     {
     case ClientMessage:
       if (xevent->xclient.message_type == 
-	  gdk_display_atom (gdk_window_get_display(plug->socket_window), "_XEMBED", FALSE))
+	  gdk_display_atom (gdk_drawable_get_display (plug->socket_window), "_XEMBED", FALSE))
 
 	{
 	  handle_xembed_message (plug,
diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c
index 3f8dfb11c..84792ce96 100644
--- a/gtk/gtkselection.c
+++ b/gtk/gtkselection.c
@@ -1264,7 +1264,7 @@ gtk_selection_incr_event (GdkWindow	   *window,
   GtkIncrInfo *info = NULL;
   gint num_bytes;
   guchar *buffer;
-  GtkSelectionDisplayCache *cache = gtk_selection_get_cache (gdk_window_get_display (window));
+  GtkSelectionDisplayCache *cache = gtk_selection_get_cache (gdk_drawable_get_display  (window));
   int i;
   
   if (event->state != GDK_PROPERTY_DELETE)
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index d86df14df..97635c659 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -895,7 +895,7 @@ send_xembed_message (GtkSocket *socket,
 
       xevent.xclient.window = GDK_WINDOW_XWINDOW (socket->plug_window);
       xevent.xclient.type = ClientMessage;
-      xevent.xclient.message_type = gdk_display_atom (gdk_window_get_display(socket->plug_window), "_XEMBED", FALSE);
+      xevent.xclient.message_type = gdk_display_atom (gdk_drawable_get_display (socket->plug_window), "_XEMBED", FALSE);
 
       xevent.xclient.format = 32;
       xevent.xclient.data.l[0] = time;
@@ -1123,7 +1123,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 	  GDK_WINDOW_XWINDOW (socket->plug_window))
 	{
 	  GdkDragProtocol protocol;
-	  GdkDisplay *display = gdk_window_get_display(socket->plug_window);
+	  GdkDisplay *display = gdk_drawable_get_display (socket->plug_window);
 
 	  if ((xevent->xproperty.atom == 
 	       gdk_display_atom (display, "XdndAware", FALSE)) ||
@@ -1145,7 +1145,7 @@ gtk_socket_filter_func (GdkXEvent *gdk_xevent, GdkEvent *event, gpointer data)
 	}
       break;
     case ClientMessage:
-      if (xevent->xclient.message_type == gdk_display_atom (gdk_window_get_display(socket->plug_window), "_XEMBED", FALSE))
+      if (xevent->xclient.message_type == gdk_display_atom (gdk_drawable_get_display (socket->plug_window), "_XEMBED", FALSE))
 
 	{
 	  handle_xembed_message (socket,
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index 934d77738..e5c2a18e1 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -2705,7 +2705,7 @@ selection_data_get_buffer (GtkSelectionData *selection_data,
     return NULL;
   
   if (selection_data->type != 
-      gdk_display_atom (gdk_window_get_display(owner), "GTK_TEXT_BUFFER_CONTENTS", FALSE))
+      gdk_display_atom (gdk_drawable_get_display (owner), "GTK_TEXT_BUFFER_CONTENTS", FALSE))
 
     return NULL;
 
diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c
index fe6f8b3ab..9fc82fed4 100644
--- a/gtk/gtktipsquery.c
+++ b/gtk/gtktipsquery.c
@@ -372,9 +372,8 @@ gtk_tips_query_real_stop_query (GtkTipsQuery *tips_query)
   gtk_grab_remove (GTK_WIDGET (tips_query));
   if (tips_query->query_cursor)
     {
-      gdk_display_pointer_ungrab (
-		     gdk_window_get_display(GTK_WIDGET (tips_query)->window),
-		     GDK_CURRENT_TIME);
+      gdk_display_pointer_ungrab (gtk_widget_get_display (tips_query),
+				  GDK_CURRENT_TIME);
       gdk_cursor_destroy (tips_query->query_cursor);
       tips_query->query_cursor = NULL;
     }
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 71dce0320..50f3e0b43 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1473,7 +1473,7 @@ gtk_tree_view_button_release_column_resize (GtkWidget      *widget,
   GTK_TREE_VIEW_UNSET_FLAG (tree_view, GTK_TREE_VIEW_IN_COLUMN_RESIZE);
   gtk_widget_get_pointer (widget, &x, NULL);
   gtk_grab_remove (widget);
-  gdk_display_pointer_ungrab (gdk_window_get_display(event->window), 
+  gdk_display_pointer_ungrab (gdk_drawable_get_display (event->window), 
 				  event->time);
 
   width = gtk_tree_view_new_column_width (GTK_TREE_VIEW (widget), i, &x);
@@ -5328,10 +5328,10 @@ _gtk_tree_view_column_start_drag (GtkTreeView       *tree_view,
       gdk_window_set_user_data (tree_view->priv->drag_window, GTK_WIDGET (tree_view));
     }
 
-  gdk_display_pointer_ungrab (gdk_window_get_display(column->button->window), 
-				  GDK_CURRENT_TIME);
-  gdk_display_keyboard_ungrab (gdk_window_get_display(column->button->window),
-				   GDK_CURRENT_TIME);
+  gdk_display_pointer_ungrab (gtk_widget_get_display (tree_view), 
+			      GDK_CURRENT_TIME);
+  gdk_display_keyboard_ungrab (gtk_widget_get_display (tree_view),
+			       GDK_CURRENT_TIME);
 
   gtk_grab_remove (column->button);
 
diff --git a/gtk/gtkvpaned.c b/gtk/gtkvpaned.c
index e642a1bd7..f26834e41 100644
--- a/gtk/gtkvpaned.c
+++ b/gtk/gtkvpaned.c
@@ -364,7 +364,7 @@ gtk_vpaned_button_release (GtkWidget      *widget,
       gtk_vpaned_xor_line (paned);
       paned->in_drag = FALSE;
       paned->position_set = TRUE;
-      gdk_display_pointer_ungrab (gdk_window_get_display(event->window),
+      gdk_display_pointer_ungrab (gdk_drawable_get_display (event->window),
 				      event->time);
       gtk_widget_queue_resize (GTK_WIDGET (paned));
       g_object_freeze_notify (object);
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 87e2bb275..fec11404a 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -2469,7 +2469,7 @@ gtk_widget_real_mnemonic_activate (GtkWidget *widget,
     {
       g_warning ("widget `%s' isn't suitable for mnemonic activation",
 		 G_OBJECT_TYPE_NAME (widget));
-      gdk_display_beep (gdk_window_get_display(widget->window));
+      gdk_display_beep (gtk_widget_get_display (widget));
     }
   return TRUE;
 }