From e7a984b33762a3edd787294b012b4524cb8fd606 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Tue, 20 Mar 2012 18:08:08 +0100
Subject: [PATCH] window: Set parent context instead of just resetting style

Otherwise the inherit properties won't inherit properly.
---
 gtk/gtkwindow.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 76f904959b..b87c22e5f5 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -2642,6 +2642,7 @@ void
 gtk_window_set_attached_to (GtkWindow *window,
                             GtkWidget *attach_widget)
 {
+  GtkStyleContext *context;
   GtkWindowPrivate *priv;
 
   g_return_if_fail (GTK_IS_WINDOW (window));
@@ -2664,7 +2665,11 @@ gtk_window_set_attached_to (GtkWindow *window,
     }
 
   /* Update the style, as the widget path might change. */
-  gtk_widget_reset_style (GTK_WIDGET (window)); 
+  context = gtk_widget_get_style_context (GTK_WIDGET (window));
+  if (priv->attach_widget)
+    gtk_style_context_set_parent (context, gtk_widget_get_style_context (priv->attach_widget));
+  else
+    gtk_style_context_set_parent (context, NULL);
 }
 
 /**