diff --git a/ChangeLog b/ChangeLog index 6e7cf46d5b..d1d2ec41d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 26 14:47:22 2004 Owen Taylor + + * gtk/gtkrc.[ch]: Export gtk_rc_reset_styles(). + (Request from Dom Lachowicz, #123769) + Wed Feb 25 19:11:31 2004 Owen Taylor * gtk/gtkradiobutton.[ch] gtk/gtkradiomenuitem.[ch]: Add a diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6e7cf46d5b..d1d2ec41d0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Feb 26 14:47:22 2004 Owen Taylor + + * gtk/gtkrc.[ch]: Export gtk_rc_reset_styles(). + (Request from Dom Lachowicz, #123769) + Wed Feb 25 19:11:31 2004 Owen Taylor * gtk/gtkradiobutton.[ch] gtk/gtkradiomenuitem.[ch]: Add a diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6e7cf46d5b..d1d2ec41d0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Feb 26 14:47:22 2004 Owen Taylor + + * gtk/gtkrc.[ch]: Export gtk_rc_reset_styles(). + (Request from Dom Lachowicz, #123769) + Wed Feb 25 19:11:31 2004 Owen Taylor * gtk/gtkradiobutton.[ch] gtk/gtkradiomenuitem.[ch]: Add a diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6e7cf46d5b..d1d2ec41d0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Feb 26 14:47:22 2004 Owen Taylor + + * gtk/gtkrc.[ch]: Export gtk_rc_reset_styles(). + (Request from Dom Lachowicz, #123769) + Wed Feb 25 19:11:31 2004 Owen Taylor * gtk/gtkradiobutton.[ch] gtk/gtkradiomenuitem.[ch]: Add a diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6e7cf46d5b..d1d2ec41d0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Feb 26 14:47:22 2004 Owen Taylor + + * gtk/gtkrc.[ch]: Export gtk_rc_reset_styles(). + (Request from Dom Lachowicz, #123769) + Wed Feb 25 19:11:31 2004 Owen Taylor * gtk/gtkradiobutton.[ch] gtk/gtkradiomenuitem.[ch]: Add a diff --git a/gtk/gtkrc.c b/gtk/gtkrc.c index 1c48897344..7659f8bdd2 100644 --- a/gtk/gtkrc.c +++ b/gtk/gtkrc.c @@ -1332,23 +1332,22 @@ gtk_rc_clear_realized_style (gpointer key, } /** - * _gtk_rc_reset_styles: + * gtk_rc_reset_styles: * @settings: a #GtkSettings * - * This setting resets all of our styles; we use it when the font - * rendering parameters or the icon sizes have changed. It's both less - * and more comprehensive then we actually need: - * - * Less comprehensive: it doesn't affect widgets that have a style - * set on them. - * - * More comprehensive: it resets the styles, but the styles haven't - * changed. The main reason for resetting the styles is becaues - * most widgets will redo all their font stuff when their style - * change. + * This function recomputes the styles for all widgets that use a + * particular #GtkSettings object. (There is one #GtkSettings object + * per #GdkScreen, see gtk_settings_get_for_screen()); It is useful + * when some global parameter has changed that affects the appearance + * of all widgets, because when a widget gets a new style, it will + * both redraw and recompute any cached information about its + * appearance. As an example, it is used when the default font size + * set by the operating system changes. Note that this function + * doesn't affect widgets that have a style set explicitely on them + * with gtk_widget_set_style(). **/ void -_gtk_rc_reset_styles (GtkSettings *settings) +gtk_rc_reset_styles (GtkSettings *settings) { GtkRcContext *context; gboolean reset = FALSE; diff --git a/gtk/gtkrc.h b/gtk/gtkrc.h index aa7eaa46bd..426937bf7e 100644 --- a/gtk/gtkrc.h +++ b/gtk/gtkrc.h @@ -133,6 +133,8 @@ GtkStyle* gtk_rc_get_style_by_paths (GtkSettings *settings, gboolean gtk_rc_reparse_all_for_settings (GtkSettings *settings, gboolean force_load); +void gtk_rc_reset_styles (GtkSettings *settings); + gchar* gtk_rc_find_pixmap_in_path (GtkSettings *settings, GScanner *scanner, const gchar *pixmap_file); @@ -213,7 +215,6 @@ guint gtk_rc_parse_state (GScanner *scanner, guint gtk_rc_parse_priority (GScanner *scanner, GtkPathPriorityType *priority); - /* rc properties * (structure forward declared in gtkstyle.h) */ @@ -232,7 +233,6 @@ const GtkRcProperty* _gtk_rc_style_lookup_rc_property (GtkRcStyle *rc_style, GQuark property_name); const gchar* _gtk_rc_context_get_default_font_name (GtkSettings *settings); -void _gtk_rc_reset_styles (GtkSettings *settings); #ifdef __cplusplus }