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

styleproperty: Remove context arg from _gtk_style_context_query()

Browse Source
This commit is contained in:
Benjamin Otte 2012-01-02 19:14:28 +01:00
parent a9d1be0bef
commit 32c8bbb575
7 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkborderimage.c
View File

@ -195,20 +195,19 @@ _gtk_border_image_unpack (const GValue *value,
void
_gtk_border_image_pack (GValue *value,
GtkStyleProperties *props,
GtkStateFlags state,
GtkStylePropertyContext *context)
GtkStateFlags state)
{
GtkBorderImage *image;
cairo_pattern_t *source;
GtkBorder *slice, *width;
GtkCssBorderImageRepeat *repeat;
_gtk_style_properties_get (props, state, context,
"border-image-source", &source,
"border-image-slice", &slice,
"border-image-repeat", &repeat,
"border-image-width", &width,
NULL);
gtk_style_properties_get (props, state,
"border-image-source", &source,
"border-image-slice", &slice,
"border-image-repeat", &repeat,
"border-image-width", &width,
NULL);
if (source == NULL)
{

3
gtk/gtkborderimageprivate.h
View File

@ -64,8 +64,7 @@ GParameter * _gtk_border_image_unpack (const GValue *valu
guint *n_params);
void _gtk_border_image_pack (GValue *value,
GtkStyleProperties *props,
GtkStateFlags state,
GtkStylePropertyContext *context);
GtkStateFlags state);
G_END_DECLS

1
gtk/gtkcssshorthandproperty.c
View File

@ -88,7 +88,6 @@ static void
_gtk_css_shorthand_property_query (GtkStyleProperty *property,
GtkStyleProperties *props,
GtkStateFlags state,
GtkStylePropertyContext *context,
GValue *value)
{
property->pack_func (value, props, state);

1
gtk/gtkcssstyleproperty.c
View File

@ -125,7 +125,6 @@ static void
_gtk_css_style_property_query (GtkStyleProperty *property,
GtkStyleProperties *props,
GtkStateFlags state,
GtkStylePropertyContext *context,
GValue *value)
{
const GValue *val;

2
gtk/gtkstyleproperties.c
View File

@ -653,7 +653,7 @@ _gtk_style_properties_get_property (GtkStyleProperties *props,
return FALSE;
}
_gtk_style_property_query (node, props, state, context, value);
_gtk_style_property_query (node, props, state, value);
return TRUE;
}

4
gtk/gtkstyleproperty.c
View File

@ -211,21 +211,19 @@ void
_gtk_style_property_query (GtkStyleProperty *property,
GtkStyleProperties *props,
GtkStateFlags state,
GtkStylePropertyContext *context,
GValue *value)
{
GtkStylePropertyClass *klass;
g_return_if_fail (property != NULL);
g_return_if_fail (GTK_IS_STYLE_PROPERTIES (props));
g_return_if_fail (context != NULL);
g_return_if_fail (value != NULL);
klass = GTK_STYLE_PROPERTY_GET_CLASS (property);
g_value_init (value, property->value_type);
klass->query (property, props, state, context, value);
klass->query (property, props, state, value);
}
static void

2
gtk/gtkstylepropertyprivate.h
View File

@ -67,7 +67,6 @@ struct _GtkStylePropertyClass
void (* query) (GtkStyleProperty *property,
GtkStyleProperties *props,
GtkStateFlags state,
GtkStylePropertyContext *context,
GValue *value);
gboolean (* parse_value) (GtkStyleProperty * property,
GValue *value,
@ -92,7 +91,6 @@ GType _gtk_style_property_get_value_type(GtkStyleProperty *
void _gtk_style_property_query (GtkStyleProperty * property,
GtkStyleProperties *props,
GtkStateFlags state,
GtkStylePropertyContext *context,
GValue *value);
void _gtk_style_property_assign (GtkStyleProperty *property,
GtkStyleProperties *props,