diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt index 56e9ade896..a84c0b34e8 100644 --- a/docs/reference/gtk/gtk3-sections.txt +++ b/docs/reference/gtk/gtk3-sections.txt @@ -5492,8 +5492,6 @@ gtk_style_properties_map_color gtk_style_properties_merge gtk_style_properties_new GtkStylePropertyParser -gtk_style_param_set_inherit -gtk_style_param_get_inherit gtk_style_properties_register_property gtk_style_properties_set gtk_style_properties_set_property diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 90eae718e5..3f15bf5218 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -2520,8 +2520,6 @@ gtk_style_has_context gtk_style_lookup_color gtk_style_lookup_icon_set gtk_style_new -gtk_style_param_get_inherit -gtk_style_param_set_inherit gtk_style_properties_clear gtk_style_properties_get gtk_style_properties_get_property diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c index 4f9a4bb112..45fdfbd8d5 100644 --- a/gtk/gtkstyleproperties.c +++ b/gtk/gtkstyleproperties.c @@ -361,54 +361,6 @@ gtk_style_properties_lookup_property (const gchar *property_name, return found; } -/* GParamSpec functionality */ - -enum { - GTK_STYLE_PARAM_INHERIT = 1 << G_PARAM_USER_SHIFT -}; - -/** - * gtk_style_param_set_inherit: - * @pspec: A style param - * @inherit: whether the @pspec value should be inherited - * - * Sets whether a param spec installed with function such as - * gtk_style_properties_register_property() or - * gtk_widget_class_install_style_property() should inherit their - * value from the parent widget if it is not set instead of using - * the default value of @pspec. See the - * - * CSS specification's description of inheritance for a - * longer description of this concept. - * - * By default, param specs do not inherit their value. - **/ -void -gtk_style_param_set_inherit (GParamSpec *pspec, - gboolean inherit) -{ - if (inherit) - pspec->flags |= GTK_STYLE_PARAM_INHERIT; - else - pspec->flags &= ~GTK_STYLE_PARAM_INHERIT; -} - -/** - * gtk_style_param_get_inherit: - * @pspec: a style param - * - * Checks if the value of this param should be inherited from the parent - * #GtkWidget instead of using the default value when it has not been - * specified. See gtk_style_param_set_inherit() for more details. - * - * Returns: %TRUE if the param should inherit its value - **/ -gboolean -gtk_style_param_get_inherit (GParamSpec *pspec) -{ - return (pspec->flags & GTK_STYLE_PARAM_INHERIT) ? TRUE : FALSE; -} - /* GtkStyleProperties methods */ /** diff --git a/gtk/gtkstyleproperties.h b/gtk/gtkstyleproperties.h index a38905e050..0cc478892b 100644 --- a/gtk/gtkstyleproperties.h +++ b/gtk/gtkstyleproperties.h @@ -66,10 +66,6 @@ typedef gboolean (* GtkStylePropertyParser) (const gchar *string, GType gtk_style_properties_get_type (void) G_GNUC_CONST; -void gtk_style_param_set_inherit (GParamSpec *pspec, - gboolean inherit); -gboolean gtk_style_param_get_inherit (GParamSpec *pspec); - /* Functions to register style properties */ void gtk_style_properties_register_property (GtkStylePropertyParser parse_func, GParamSpec *pspec); diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c index c5ddb4b46b..6458c83f8f 100644 --- a/gtk/gtkstyleproperty.c +++ b/gtk/gtkstyleproperty.c @@ -1946,8 +1946,7 @@ _gtk_style_property_is_inherit (const GtkStyleProperty *property) { g_return_val_if_fail (property != NULL, FALSE); - return property->flags & GTK_STYLE_PROPERTY_INHERIT || - gtk_style_param_get_inherit (property->pspec); + return property->flags & GTK_STYLE_PROPERTY_INHERIT ? TRUE : FALSE; } gboolean