set the background of our bin window also (fixes #58957)

2002-01-09  jacob berkman  <jacob@ximian.com>

	* gtk/gtklayout.c (gtk_layout_style_set): set the background of
	our bin window also (fixes #58957)

diff --git a/ChangeLog b/ChangeLog
index 323e8a91b8d487d08ecea78443e85616e9957d9e..66b608339b4b1059dbe713e26c3986475d69a2b8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-09  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtklayout.c (gtk_layout_style_set): set the background of
+       our bin window also (fixes #58957)
+
 Wed Jan  9 19:10:07 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 323e8a91b8d487d08ecea78443e85616e9957d9e..66b608339b4b1059dbe713e26c3986475d69a2b8 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2002-01-09  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtklayout.c (gtk_layout_style_set): set the background of
+       our bin window also (fixes #58957)
+
 Wed Jan  9 19:10:07 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 323e8a91b8d487d08ecea78443e85616e9957d9e..66b608339b4b1059dbe713e26c3986475d69a2b8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2002-01-09  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtklayout.c (gtk_layout_style_set): set the background of
+       our bin window also (fixes #58957)
+
 Wed Jan  9 19:10:07 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 323e8a91b8d487d08ecea78443e85616e9957d9e..66b608339b4b1059dbe713e26c3986475d69a2b8 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2002-01-09  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtklayout.c (gtk_layout_style_set): set the background of
+       our bin window also (fixes #58957)
+
 Wed Jan  9 19:10:07 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 323e8a91b8d487d08ecea78443e85616e9957d9e..66b608339b4b1059dbe713e26c3986475d69a2b8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2002-01-09  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtklayout.c (gtk_layout_style_set): set the background of
+       our bin window also (fixes #58957)
+
 Wed Jan  9 19:10:07 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 323e8a91b8d487d08ecea78443e85616e9957d9e..66b608339b4b1059dbe713e26c3986475d69a2b8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2002-01-09  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtklayout.c (gtk_layout_style_set): set the background of
+       our bin window also (fixes #58957)
+
 Wed Jan  9 19:10:07 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 323e8a91b8d487d08ecea78443e85616e9957d9e..66b608339b4b1059dbe713e26c3986475d69a2b8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2002-01-09  jacob berkman  <jacob@ximian.com>
+
+       * gtk/gtklayout.c (gtk_layout_style_set): set the background of
+       our bin window also (fixes #58957)
+
 Wed Jan  9 19:10:07 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeselection.c

diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index 3948fb0fd7121adf0c8bdcb8433434fd1b4b1cb4..73831f8f43cd7468a1f9c26c31295f8b077367fd 100644 (file)
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -101,6 +101,8 @@ static void gtk_layout_allocate_child     (GtkLayout      *layout,
                                            GtkLayoutChild *child);
 static void gtk_layout_adjustment_changed (GtkAdjustment  *adjustment,
                                            GtkLayout      *layout);
+static void gtk_layout_style_set          (GtkWidget      *widget,
+                                          GtkStyle       *old_style);
 
 
 static GtkWidgetClass *parent_class = NULL;
@@ -630,6 +632,7 @@ gtk_layout_class_init (GtkLayoutClass *class)
   widget_class->size_request = gtk_layout_size_request;
   widget_class->size_allocate = gtk_layout_size_allocate;
   widget_class->expose_event = gtk_layout_expose;
+  widget_class->style_set = gtk_layout_style_set;
 
   container_class->remove = gtk_layout_remove;
   container_class->forall = gtk_layout_forall;
@@ -834,6 +837,18 @@ gtk_layout_realize (GtkWidget *widget)
     }
 }
 
+static void
+gtk_layout_style_set (GtkWidget *widget, GtkStyle *old_style)
+{
+  if (GTK_WIDGET_CLASS (parent_class)->style_set)
+    (* GTK_WIDGET_CLASS (parent_class)->style_set) (widget, old_style);
+
+  if (GTK_WIDGET_REALIZED (widget))
+    {
+      gtk_style_set_background (widget->style, GTK_LAYOUT (widget)->bin_window, GTK_STATE_NORMAL);
+    }
+}
+
 static void 
 gtk_layout_map (GtkWidget *widget)
 {