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
This commit is contained in:
Marco Brito
2013-11-30 11:36:00 +00:00
committed by Matthias Clasen
parent c12d7c7e7b
commit 46d8efec5c

View File

@@ -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