AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

styleproperty: Move property_parse_func member

Browse Source 
It belongs in GtkCssCustomProperty
This commit is contained in:
Benjamin Otte 2012-01-02 10:41:41 +01:00
parent 61042d155c
commit 3375dd2a5f
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkcsscustomproperty.c
View File

@ -35,11 +35,12 @@ gtk_css_custom_property_parse_value (GtkStyleProperty *property,
GtkCssParser *parser,
GFile *base)
{
GtkCssCustomProperty *custom = GTK_CSS_CUSTOM_PROPERTY (property);
gboolean success;
g_value_init (value, _gtk_style_property_get_value_type (property));
if (property->property_parse_func)
if (custom->property_parse_func)
{
GError *error = NULL;
char *value_str;
@ -47,7 +48,7 @@ gtk_css_custom_property_parse_value (GtkStyleProperty *property,
value_str = _gtk_css_parser_read_value (parser);
if (value_str != NULL)
{
success = (*property->property_parse_func) (value_str, value, &error);
success = (* custom->property_parse_func) (value_str, value, &error);
g_free (value_str);
}
else
@ -147,7 +148,7 @@ gtk_theming_engine_register_property (const gchar *name_space,
GtkStylePropertyParser parse_func,
GParamSpec *pspec)
{
GtkStyleProperty *node;
GtkCssCustomProperty *node;
GValue initial = { 0, };
gchar *name;
@ -186,7 +187,7 @@ void
gtk_style_properties_register_property (GtkStylePropertyParser parse_func,
GParamSpec *pspec)
{
GtkStyleProperty *node;
GtkCssCustomProperty *node;
GValue initial = { 0, };
g_return_if_fail (G_IS_PARAM_SPEC (pspec));
@ -232,11 +233,13 @@ gtk_style_properties_lookup_property (const gchar *property_name,
if (GTK_IS_CSS_CUSTOM_PROPERTY (node))
{
GtkCssCustomProperty *custom = GTK_CSS_CUSTOM_PROPERTY (node);
if (pspec)
*pspec = GTK_CSS_STYLE_PROPERTY (node)->pspec;
if (parse_func)
*parse_func = node->property_parse_func;
*parse_func = custom->property_parse_func;
found = TRUE;
}

2
gtk/gtkcsscustompropertyprivate.h
View File

@ -38,6 +38,8 @@ typedef struct _GtkCssCustomPropertyClass GtkCssCustomPropertyClass;
struct _GtkCssCustomProperty
{
GtkCssStyleProperty parent;
GtkStylePropertyParser property_parse_func;
};
struct _GtkCssCustomPropertyClass

1
gtk/gtkstylepropertyprivate.h
View File

@ -58,7 +58,6 @@ struct _GtkStyleProperty
char *name;
GType value_type;
GtkStylePropertyParser property_parse_func;
GtkStyleUnpackFunc unpack_func;
GtkStylePackFunc pack_func;
GtkStyleParseFunc parse_func;