diff options
author | Benjamin Otte <otte@redhat.com> | 2012-01-02 00:28:56 +0100 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2012-01-09 18:37:53 +0100 |
commit | 4821e52cf2ce967e024d37a9f329008a8ed46658 (patch) | |
tree | 576618425a7f3d35aa5534eedfe934faab7cf6e3 | |
parent | 5ae00c375541fb5ca1105a9f6025e248511cd155 (diff) | |
download | gtk+-4821e52cf2ce967e024d37a9f329008a8ed46658.tar.gz |
styleproperty: Move pspec to GtkCssStyleProperty
shorthands don't use pspecs anymore.
-rw-r--r-- | gtk/gtkcsscustomproperty.c | 6 | ||||
-rw-r--r-- | gtk/gtkcssstylepropertyprivate.h | 1 | ||||
-rw-r--r-- | gtk/gtkstyleproperties.c | 2 | ||||
-rw-r--r-- | gtk/gtkstyleproperty.c | 2 | ||||
-rw-r--r-- | gtk/gtkstylepropertyprivate.h | 2 |
5 files changed, 6 insertions, 7 deletions
diff --git a/gtk/gtkcsscustomproperty.c b/gtk/gtkcsscustomproperty.c index ab0ec9eb96..1175af3e63 100644 --- a/gtk/gtkcsscustomproperty.c +++ b/gtk/gtkcsscustomproperty.c @@ -126,7 +126,7 @@ gtk_theming_engine_register_property (const gchar *name_space, "name", name, "value-type", pspec->value_type, NULL); - node->pspec = pspec; + GTK_CSS_STYLE_PROPERTY (node)->pspec = pspec; node->property_parse_func = parse_func; g_value_unset (&initial); @@ -161,7 +161,7 @@ gtk_style_properties_register_property (GtkStylePropertyParser parse_func, "name", pspec->name, "value-type", pspec->value_type, NULL); - node->pspec = pspec; + GTK_CSS_STYLE_PROPERTY (node)->pspec = pspec; node->property_parse_func = parse_func; g_value_unset (&initial); @@ -196,7 +196,7 @@ gtk_style_properties_lookup_property (const gchar *property_name, if (GTK_IS_CSS_CUSTOM_PROPERTY (node)) { if (pspec) - *pspec = node->pspec; + *pspec = GTK_CSS_STYLE_PROPERTY (node)->pspec; if (parse_func) *parse_func = node->property_parse_func; diff --git a/gtk/gtkcssstylepropertyprivate.h b/gtk/gtkcssstylepropertyprivate.h index aba791c666..de84786d83 100644 --- a/gtk/gtkcssstylepropertyprivate.h +++ b/gtk/gtkcssstylepropertyprivate.h @@ -41,6 +41,7 @@ struct _GtkCssStyleProperty GValue initial_value; guint id; + GParamSpec *pspec; guint inherit :1; }; diff --git a/gtk/gtkstyleproperties.c b/gtk/gtkstyleproperties.c index 0431905b1d..4919699fac 100644 --- a/gtk/gtkstyleproperties.c +++ b/gtk/gtkstyleproperties.c @@ -485,7 +485,7 @@ _gtk_style_properties_set_property_by_property (GtkStyleProperties *props, g_value_copy (value, val); if (_gtk_style_property_get_value_type (GTK_STYLE_PROPERTY (style_prop)) == G_VALUE_TYPE (value)) - g_param_value_validate (GTK_STYLE_PROPERTY (style_prop)->pspec, val); + g_param_value_validate (style_prop->pspec, val); } /** diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c index b444cf104a..de852ea3e3 100644 --- a/gtk/gtkstyleproperty.c +++ b/gtk/gtkstyleproperty.c @@ -954,7 +954,7 @@ _gtk_style_property_register (GParamSpec *pspec, "value-type", pspec->value_type, NULL); g_assert (node->value_type == pspec->value_type); - node->pspec = pspec; + GTK_CSS_STYLE_PROPERTY (node)->pspec = pspec; node->property_parse_func = property_parse_func; node->parse_func = parse_func; node->print_func = print_func; diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h index 7b7b60bbec..73bd23fe75 100644 --- a/gtk/gtkstylepropertyprivate.h +++ b/gtk/gtkstylepropertyprivate.h @@ -58,8 +58,6 @@ struct _GtkStyleProperty char *name; GType value_type; - GParamSpec *pspec; - GtkStylePropertyParser property_parse_func; GtkStyleUnpackFunc unpack_func; GtkStylePackFunc pack_func; |