[gtk+] container: Properly reorder no-window children

[Benjamin Otte <otte src gnome org>]

commit 409760babfbb3abd34b9a6d208a9175a23d89bc2
Author: Benjamin Otte <otte redhat com>
Date:   Tue Jan 19 04:33:09 2016 +0100

    container: Properly reorder no-window children
    
    ... that are setup with gtk_widget_set_parent_window().
    
    Fixes scrollbars not being drawn in GtkScrolledWindow.

 gtk/gtkcontainer.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 7962208..86501d7 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -3564,9 +3564,9 @@ gtk_container_draw_forall (GtkWidget *widget,
     {
       info.child = widget;
       info.window_depth = G_MAXINT;
-      if (_gtk_widget_get_has_window (widget))
+      window = _gtk_widget_get_window (widget);
+      if (window != gtk_widget_get_window (GTK_WIDGET (data->container)))
         {
-          window = _gtk_widget_get_window (widget);
           siblings = gdk_window_peek_children (gdk_window_get_parent (window));
           info.window_depth = g_list_index (siblings, window);
         }