[gtk+/gtk-3-10] Add class toolbar before the style context is created for the widget.
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-10] Add class toolbar before the style context is created for the widget.
- Date: Sun, 1 Dec 2013 22:21:31 +0000 (UTC)
commit 46d8efec5ca715ecf7cd59b539fbc82cd35ca000
Author: Marco Brito <bcaza null net>
Date: Sat Nov 30 11:36:00 2013 +0000
Add class toolbar before the style context is created for the widget.
The call to gtk_button_set_relief() in gtk_toolbar_init() indirectly
used the style context of the half-created widget, before we had a
chance to add the "toolbar" style class to it.
Reorder gtk_toolbar_init() to ensure that the proper style class is
set first.
https://bugzilla.gnome.org/show_bug.cgi?id=719595
gtk/gtktoolbar.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index d8fb693..00c3a7a 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -677,6 +677,9 @@ gtk_toolbar_init (GtkToolbar *toolbar)
toolbar->priv = gtk_toolbar_get_instance_private (toolbar);
priv = toolbar->priv;
+ context = gtk_widget_get_style_context (GTK_WIDGET (toolbar));
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOOLBAR);
+
gtk_widget_set_can_focus (GTK_WIDGET (toolbar), FALSE);
gtk_widget_set_has_window (GTK_WIDGET (toolbar), FALSE);
@@ -710,9 +713,6 @@ gtk_toolbar_init (GtkToolbar *toolbar)
priv->max_homogeneous_pixels = -1;
priv->timer = g_timer_new ();
-
- context = gtk_widget_get_style_context (GTK_WIDGET (toolbar));
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOOLBAR);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]