From fd303c56b9be5dc2fd242c87be98c321be44f61b Mon Sep 17 00:00:00 2001 From: Soeren Sandmann Date: Sat, 7 Sep 2002 20:44:26 +0000 Subject: [PATCH] call gtk_widget_ensure_style() before reading "button_relief". Fixes Sat Sep 7 21:24:55 2002 Soeren Sandmann * gtk/gtktoolbar.c (get_button_relief): call gtk_widget_ensure_style() before reading "button_relief". Fixes (#92741). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ docs/reference/gtk/tmpl/gtkhbbox.sgml | 1 + docs/reference/gtk/tmpl/gtkvbbox.sgml | 1 + gtk/gtktoolbar.c | 5 +++-- 9 files changed, 41 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1843d182a..3720d648fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Sep 7 21:24:55 2002 Soeren Sandmann + + * gtk/gtktoolbar.c (get_button_relief): call + gtk_widget_ensure_style() before reading "button_relief". Fixes + (#92741). + 2002-09-06 Matthias Clasen * configure.in: Add ani to all_loaders. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b1843d182a..3720d648fd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Sep 7 21:24:55 2002 Soeren Sandmann + + * gtk/gtktoolbar.c (get_button_relief): call + gtk_widget_ensure_style() before reading "button_relief". Fixes + (#92741). + 2002-09-06 Matthias Clasen * configure.in: Add ani to all_loaders. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b1843d182a..3720d648fd 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Sep 7 21:24:55 2002 Soeren Sandmann + + * gtk/gtktoolbar.c (get_button_relief): call + gtk_widget_ensure_style() before reading "button_relief". Fixes + (#92741). + 2002-09-06 Matthias Clasen * configure.in: Add ani to all_loaders. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b1843d182a..3720d648fd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Sep 7 21:24:55 2002 Soeren Sandmann + + * gtk/gtktoolbar.c (get_button_relief): call + gtk_widget_ensure_style() before reading "button_relief". Fixes + (#92741). + 2002-09-06 Matthias Clasen * configure.in: Add ani to all_loaders. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b1843d182a..3720d648fd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Sep 7 21:24:55 2002 Soeren Sandmann + + * gtk/gtktoolbar.c (get_button_relief): call + gtk_widget_ensure_style() before reading "button_relief". Fixes + (#92741). + 2002-09-06 Matthias Clasen * configure.in: Add ani to all_loaders. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b1843d182a..3720d648fd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Sep 7 21:24:55 2002 Soeren Sandmann + + * gtk/gtktoolbar.c (get_button_relief): call + gtk_widget_ensure_style() before reading "button_relief". Fixes + (#92741). + 2002-09-06 Matthias Clasen * configure.in: Add ani to all_loaders. diff --git a/docs/reference/gtk/tmpl/gtkhbbox.sgml b/docs/reference/gtk/tmpl/gtkhbbox.sgml index a35245aec5..21f4d16437 100644 --- a/docs/reference/gtk/tmpl/gtkhbbox.sgml +++ b/docs/reference/gtk/tmpl/gtkhbbox.sgml @@ -50,6 +50,7 @@ gtk_button_box_set_layout(). GtkHButtonBox does not contain any public fields. + Creates a new horizontal button box. diff --git a/docs/reference/gtk/tmpl/gtkvbbox.sgml b/docs/reference/gtk/tmpl/gtkvbbox.sgml index 977da2ff95..4882693c8e 100644 --- a/docs/reference/gtk/tmpl/gtkvbbox.sgml +++ b/docs/reference/gtk/tmpl/gtkvbbox.sgml @@ -50,6 +50,7 @@ gtk_button_box_set_layout(). GtkVButtonBox does not contain any public fields. + Creates a new vertical button box. diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c index 3366841b5b..43373d8311 100644 --- a/gtk/gtktoolbar.c +++ b/gtk/gtktoolbar.c @@ -1779,9 +1779,10 @@ static GtkReliefStyle get_button_relief (GtkToolbar *toolbar) { GtkReliefStyle button_relief = GTK_RELIEF_NORMAL; - + + gtk_widget_ensure_style (GTK_WIDGET (toolbar)); gtk_widget_style_get (GTK_WIDGET (toolbar), - "button_relief", &button_relief, + "button_relief", &button_relief, NULL); return button_relief;