[gtk+/gtk-2-24] Don't use newly deprecated gdk_drawable apis

[Matthias Clasen <matthiasc src gnome org>]

commit 9f08f69f4bcf23f564b3dbc7e25fd0d2e11c18b5
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Oct 8 14:39:17 2010 -0400

    Don't use newly deprecated gdk_drawable apis
    
    https://bugzilla.gnome.org/show_bug.cgi?id=631697

 gtk/gtkcalendar.c |    3 ++-
 gtk/gtkcombobox.c |    2 +-
 gtk/gtkentry.c    |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index 806de81..f87d112 100644
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -2732,7 +2732,8 @@ calendar_paint_arrow (GtkCalendar *calendar,
       cairo_paint (cr);
       cairo_destroy (cr);
       
-      gdk_drawable_get_size (window, &width, &height);
+      width = gdk_window_get_width (window);
+      height = gdk_window_get_height (window);
       if (arrow == ARROW_MONTH_LEFT || arrow == ARROW_YEAR_LEFT)
 	gtk_paint_arrow (widget->style, window, state, 
 			 GTK_SHADOW_OUT, NULL, widget, "calendar",
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index c7bcc87..6017503 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1875,7 +1875,7 @@ popup_grab_on_window (GdkWindow *window,
 	return TRUE;
       else
 	{
-	  gdk_display_pointer_ungrab (gdk_drawable_get_display (window),
+	  gdk_display_pointer_ungrab (gdk_window_get_display (window),
 				      activate_time);
 	  return FALSE;
 	}
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index 0cd3104..2875c4f 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -3000,7 +3000,7 @@ gtk_entry_get_text_area_size (GtkEntry *entry,
   _gtk_entry_get_borders (entry, &xborder, &yborder);
 
   if (gtk_widget_get_realized (widget))
-    gdk_drawable_get_size (widget->window, NULL, &frame_height);
+    frame_height = gdk_window_get_height (widget->window);
   else
     frame_height = requisition.height;
 
@@ -4067,7 +4067,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);