summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2016-05-06 10:12:14 -0400
committerMatthias Clasen <mclasen@redhat.com>2016-05-06 10:14:07 -0400
commit0f116135f4a5033ce4e9dfa19f10624701fa615c (patch)
tree2c612267b9a1d849cd5d99bb74cd30faeff98cc2
parent12dfb368e29bb58b4313b578f0ce75cfc8ead9a1 (diff)
downloadgtk+-0f116135f4a5033ce4e9dfa19f10624701fa615c.tar.gz
Avoid emitting ::style-set by name
GtkStyle is deprecated, but we still emit ::style-set quite a bit, so lets at least not be slow while doing it.
-rw-r--r--gtk/deprecated/gtkstyle.c2
-rw-r--r--gtk/gtkwidget.c5
2 files changed, 3 insertions, 4 deletions
diff --git a/gtk/deprecated/gtkstyle.c b/gtk/deprecated/gtkstyle.c
index 7bef213c73..403c460fb3 100644
--- a/gtk/deprecated/gtkstyle.c
+++ b/gtk/deprecated/gtkstyle.c
@@ -4154,8 +4154,6 @@ gtk_widget_ensure_style (GtkWidget *widget)
{
g_object_unref (style);
_gtk_widget_set_style (widget, NULL);
-
- g_signal_emit_by_name (widget, "style-set", 0, NULL);
}
}
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 473dc5b4b9..f8f08ee865 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -5439,9 +5439,9 @@ gtk_widget_realize (GtkWidget *widget)
if (priv->parent && !_gtk_widget_get_realized (priv->parent))
gtk_widget_realize (priv->parent);
- G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_widget_ensure_style (widget);
- G_GNUC_END_IGNORE_DEPRECATIONS;
+ G_GNUC_END_IGNORE_DEPRECATIONS
if (priv->style_update_pending)
g_signal_emit (widget, widget_signals[STYLE_UPDATED], 0);
@@ -16599,6 +16599,7 @@ void
_gtk_widget_set_style (GtkWidget *widget,
GtkStyle *style)
{
+ g_signal_emit (widget, widget_signals[STYLE_SET], 0, widget->priv->style);
widget->priv->style = style;
}