[gtk+] styleproperty: Add _gtk_style_property_is_inherit()
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] styleproperty: Add _gtk_style_property_is_inherit()
- Date: Thu, 2 Jun 2011 00:13:09 +0000 (UTC)
commit fd4ffbb6dab08babc8b464c679e3d91f749cee76
Author: Benjamin Otte <otte redhat com>
Date: Tue May 31 12:05:43 2011 +0200
styleproperty: Add _gtk_style_property_is_inherit()
And use it instead of gtk_style_param_get_inherit()
gtk/gtkcssprovider.c | 4 ++--
gtk/gtkstyleproperty.c | 8 ++++++++
gtk/gtkstylepropertyprivate.h | 2 ++
3 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 32e9b87..e3ca238 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -1126,7 +1126,7 @@ gtk_css_ruleset_add (GtkCssRuleset *ruleset,
return;
}
- ruleset->has_inherit |= gtk_style_param_get_inherit (prop->pspec);
+ ruleset->has_inherit |= _gtk_style_property_is_inherit (prop);
g_hash_table_insert (ruleset->style, (gpointer) prop, value);
}
@@ -1327,7 +1327,7 @@ gtk_css_provider_get_style (GtkStyleProvider *provider,
{
GtkStyleProperty *prop = key;
- if (l != length && !gtk_style_param_get_inherit (prop->pspec))
+ if (l != length && !_gtk_style_property_is_inherit (prop))
continue;
_gtk_style_properties_set_property_by_property (props,
diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index efb9785..a6bf234 100644
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -1942,6 +1942,14 @@ _gtk_style_property_default_value (const GtkStyleProperty *property,
}
gboolean
+_gtk_style_property_is_inherit (const GtkStyleProperty *property)
+{
+ g_return_val_if_fail (property != NULL, FALSE);
+
+ return gtk_style_param_get_inherit (property->pspec);
+}
+
+gboolean
_gtk_style_property_is_shorthand (const GtkStyleProperty *property)
{
g_return_val_if_fail (property != NULL, FALSE);
diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h
index 30aa62f..7ee23f8 100644
--- a/gtk/gtkstylepropertyprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -61,6 +61,8 @@ void _gtk_style_property_register (GParamSpec
GtkStylePrintFunc print_func,
GtkStyleDefaultValueFunc default_value_func);
+gboolean _gtk_style_property_is_inherit (const GtkStyleProperty *property);
+
void _gtk_style_property_default_value (const GtkStyleProperty *property,
GtkStyleProperties *properties,
GValue *value);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]