summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacob berkman <jacob@ximian.com>2002-01-10 00:32:22 +0000
committerJacob Berkman <jberkman@src.gnome.org>2002-01-10 00:32:22 +0000
commitf3f0ad29f101b3701a3e379c7100e6dc90d89740 (patch)
tree0688758d1afeaf499d1a3aeaeb6e5e131cf01e5d
parented50ebfb28e7a04ca4236f7bf2deaf43f1b3d579 (diff)
downloadgtk+-f3f0ad29f101b3701a3e379c7100e6dc90d89740.tar.gz
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)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-05
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtklayout.c15
8 files changed, 50 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 323e8a91b8..66b608339b 100644
--- 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 323e8a91b8..66b608339b 100644
--- 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 323e8a91b8..66b608339b 100644
--- 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 323e8a91b8..66b608339b 100644
--- 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 323e8a91b8..66b608339b 100644
--- 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 323e8a91b8..66b608339b 100644
--- 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 323e8a91b8..66b608339b 100644
--- 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 3948fb0fd7..73831f8f43 100644
--- 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)
{