diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2017-01-10 18:37:12 -0500 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2017-01-10 19:56:02 -0500 |
| commit | a013a16d1ceab34927a81f7f380823cf6bb4b72a (patch) | |
| tree | 55ac943062d39abd2e52794a01c9b1fee1737eef | |
| parent | d9bc675cbab744733fb805163a0e95fc7cdf3280 (diff) | |
| download | gtk+-a013a16d1ceab34927a81f7f380823cf6bb4b72a.tar.gz | |
Use _gtk_widget_get_window more
This avoids type checks in places where we know it is safe.
| -rw-r--r-- | gtk/gtkiconhelper.c | 5 | ||||
| -rw-r--r-- | gtk/gtktooltip.c | 2 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/gtk/gtkiconhelper.c b/gtk/gtkiconhelper.c index 72eaa62f72..15d6e42ccc 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 b722f9e1db..3ac5ed0218 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 d80e25c384..8624647533 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); |