[gtk+] Use gtk_style_context_reset_widgets() instead of gtk_rc_reset_styles()
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Use gtk_style_context_reset_widgets() instead of gtk_rc_reset_styles()
- Date: Sat, 4 Dec 2010 15:27:58 +0000 (UTC)
commit 3b3307b946ed3fb7e3669ed98ec154d4b161bb1d
Author: Carlos Garcia Campos <cgarcia igalia com>
Date: Fri Dec 3 14:08:33 2010 +0100
Use gtk_style_context_reset_widgets() instead of gtk_rc_reset_styles()
gtk/gtkiconfactory.c | 2 +-
gtk/gtkicontheme.c | 5 +----
gtk/gtksettings.c | 6 +++---
3 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 92fea10..b70a628 100644
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -796,7 +796,7 @@ icon_size_settings_changed (GtkSettings *settings,
{
icon_size_set_all_from_settings (settings);
- gtk_rc_reset_styles (settings);
+ gtk_style_context_reset_widgets (_gtk_settings_get_screen (settings));
}
static void
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index c4cefe6..2f41849 100644
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -606,10 +606,7 @@ reset_styles_idle (gpointer user_data)
priv = icon_theme->priv;
if (priv->screen && priv->is_screen_singleton)
- {
- GtkSettings *settings = gtk_settings_get_for_screen (priv->screen);
- gtk_rc_reset_styles (settings);
- }
+ gtk_style_context_reset_widgets (priv->screen);
priv->reset_styles_idle = 0;
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 2f51758..f84bc9b 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -1572,18 +1572,18 @@ gtk_settings_notify (GObject *object,
* widgets with gtk_widget_style_set(), and also causes more
* recomputation than necessary.
*/
- gtk_rc_reset_styles (GTK_SETTINGS (object));
+ gtk_style_context_reset_widgets (settings->screen);
break;
case PROP_XFT_ANTIALIAS:
case PROP_XFT_HINTING:
case PROP_XFT_HINTSTYLE:
case PROP_XFT_RGBA:
settings_update_font_options (settings);
- gtk_rc_reset_styles (GTK_SETTINGS (object));
+ gtk_style_context_reset_widgets (settings->screen);
break;
case PROP_FONTCONFIG_TIMESTAMP:
if (settings_update_fontconfig (settings))
- gtk_rc_reset_styles (GTK_SETTINGS (object));
+ gtk_style_context_reset_widgets (settings->screen);
break;
case PROP_CURSOR_THEME_NAME:
case PROP_CURSOR_THEME_SIZE:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]