diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-01-02 18:39:03 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-01-09 18:37:56 +0100 |
| commit | a9d1be0bef22fd6c628e97b8ec800eee0ea3dd3b (patch) | |
| tree | 2cdda3969c884ae6e5282a9514bb1b1a01182064 /gtk | |
| parent | e8cb6f31651dcffec6370d94aa8a325f46467116 (diff) | |
| download | gtk+-a9d1be0bef22fd6c628e97b8ec800eee0ea3dd3b.tar.gz | |
stylecontext: Remove GtkStylePropertyContext from pack funcs
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkcssshorthandproperty.c | 2 | ||||
| -rw-r--r-- | gtk/gtkcssshorthandpropertyimpl.c | 18 | ||||
| -rw-r--r-- | gtk/gtkstylepropertyprivate.h | 3 |
3 files changed, 8 insertions, 15 deletions
diff --git a/gtk/gtkcssshorthandproperty.c b/gtk/gtkcssshorthandproperty.c index 8258c001f4..d5a9005944 100644 --- a/gtk/gtkcssshorthandproperty.c +++ b/gtk/gtkcssshorthandproperty.c @@ -91,7 +91,7 @@ _gtk_css_shorthand_property_query (GtkStyleProperty *property, GtkStylePropertyContext *context, GValue *value) { - property->pack_func (value, props, state, context); + property->pack_func (value, props, state); } static gboolean diff --git a/gtk/gtkcssshorthandpropertyimpl.c b/gtk/gtkcssshorthandpropertyimpl.c index 4afa2eee7c..a977971ef2 100644 --- a/gtk/gtkcssshorthandpropertyimpl.c +++ b/gtk/gtkcssshorthandpropertyimpl.c @@ -335,8 +335,7 @@ unpack_border_width (const GValue *value, static void pack_border_width (GValue *value, GtkStyleProperties *props, - GtkStateFlags state, - GtkStylePropertyContext *context) + GtkStateFlags state) { pack_border (value, props, state, "border-top-width", "border-left-width", @@ -355,8 +354,7 @@ unpack_padding (const GValue *value, static void pack_padding (GValue *value, GtkStyleProperties *props, - GtkStateFlags state, - GtkStylePropertyContext *context) + GtkStateFlags state) { pack_border (value, props, state, "padding-top", "padding-left", @@ -375,8 +373,7 @@ unpack_margin (const GValue *value, static void pack_margin (GValue *value, GtkStyleProperties *props, - GtkStateFlags state, - GtkStylePropertyContext *context) + GtkStateFlags state) { pack_border (value, props, state, "margin-top", "margin-left", @@ -412,8 +409,7 @@ unpack_border_radius (const GValue *value, static void pack_border_radius (GValue *value, GtkStyleProperties *props, - GtkStateFlags state, - GtkStylePropertyContext *context) + GtkStateFlags state) { GtkCssBorderCornerRadius *top_left; @@ -513,8 +509,7 @@ unpack_font_description (const GValue *value, static void pack_font_description (GValue *value, GtkStyleProperties *props, - GtkStateFlags state, - GtkStylePropertyContext *context) + GtkStateFlags state) { PangoFontDescription *description; char **families; @@ -592,8 +587,7 @@ unpack_border_color (const GValue *value, static void pack_border_color (GValue *value, GtkStyleProperties *props, - GtkStateFlags state, - GtkStylePropertyContext *context) + GtkStateFlags state) { /* NB: We are a color property, so we have to resolve to a color here. * So we just resolve to a color. We pick one and stick to it. diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h index 92cfb0761c..3d72facc80 100644 --- a/gtk/gtkstylepropertyprivate.h +++ b/gtk/gtkstylepropertyprivate.h @@ -43,8 +43,7 @@ typedef GParameter * (* GtkStyleUnpackFunc) (const GValue guint *n_params); typedef void (* GtkStylePackFunc) (GValue *value, GtkStyleProperties *props, - GtkStateFlags state, - GtkStylePropertyContext *context); + GtkStateFlags state); struct _GtkStyleProperty { |