[gtk+/wip/alexl/rendertree] Use _gtk_widget_get_window more

[Matthias Clasen <matthiasc src gnome org>]

commit 8b23fa95fda21fb9dac263608bfc9afa63ae05c3
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jan 10 18:37:12 2017 -0500

    Use _gtk_widget_get_window more
    
    This avoids type checks in places where we know it is safe.

 gtk/gtkiconhelper.c |    5 +++--
 gtk/gtktooltip.c    |    2 +-
 gtk/gtkwidget.c     |    4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c
index 72eaa62..15d6e42 100644
--- a/gtk/gtkiconhelper.c
+++ b/gtk/gtkiconhelper.c
@@ -32,6 +32,7 @@
 #include "gtkiconthemeprivate.h"
 #include "gtkrendericonprivate.h"
 #include "gtksnapshot.h"
+#include "gtkwidgetprivate.h"
 
 struct _GtkIconHelperPrivate {
   GtkImageDefinition *def;
@@ -391,7 +392,7 @@ ensure_surface_from_pixbuf (GtkIconHelper *self,
   else
     pixbuf = g_object_ref (orig_pixbuf);
 
-  surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale, gtk_widget_get_window 
(gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
+  surface = gdk_cairo_surface_create_from_pixbuf (pixbuf, scale, _gtk_widget_get_window 
(gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
   g_object_unref (pixbuf);
 
   return surface;
@@ -464,7 +465,7 @@ ensure_surface_for_gicon (GtkIconHelper    *self,
       symbolic = FALSE;
     }
 
-  surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, gtk_widget_get_window 
(gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
+  surface = gdk_cairo_surface_create_from_pixbuf (destination, scale, _gtk_widget_get_window 
(gtk_css_gadget_get_owner (GTK_CSS_GADGET (self))));
 
   if (symbolic)
     {
diff --git a/gtk/gtktooltip.c b/gtk/gtktooltip.c
index b722f9e..3ac5ed0 100644
--- a/gtk/gtktooltip.c
+++ b/gtk/gtktooltip.c
@@ -612,7 +612,7 @@ _gtk_widget_find_at_coords (GdkWindow *window,
    * coordinates stay relative to the current window.
    * We end up with window == widget->window, coordinates relative to that.
    */
-  while (window && window != gtk_widget_get_window (event_widget))
+  while (window && window != _gtk_widget_get_window (event_widget))
     {
       gdouble px, py;
 
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index d80e25c..8624647 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4986,8 +4986,8 @@ gtk_widget_real_queue_draw_child (GtkWidget            *widget,
   GdkWindow *child_window, *window;
   cairo_region_t *region;
 
-  window = gtk_widget_get_window (widget);
-  child_window = gtk_widget_get_window (child);
+  window = _gtk_widget_get_window (widget);
+  child_window = _gtk_widget_get_window (child);
 
   if (child_window == window)
     gtk_widget_queue_draw_region (widget, child_region);