diff options
| author | Benjamin Otte <otte@redhat.com> | 2012-01-10 19:02:42 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2012-01-11 15:48:53 +0100 |
| commit | e603992ac7fb7c96ac878bc36a40c82bcaba6aeb (patch) | |
| tree | 17c789ac96115c70dd722313ab9e020982f9b46e /gtk/gtkcssshorthandproperty.c | |
| parent | aa98aca45f54df4dc59bbf542be0c712b24284be (diff) | |
| download | gtk+-e603992ac7fb7c96ac878bc36a40c82bcaba6aeb.tar.gz | |
shorthand: Move pack funcs from base class
Also make the vfuncs take the shorthand as an argument.
Diffstat (limited to 'gtk/gtkcssshorthandproperty.c')
| -rw-r--r-- | gtk/gtkcssshorthandproperty.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/gtkcssshorthandproperty.c b/gtk/gtkcssshorthandproperty.c index 7352788122..dbe8216cc0 100644 --- a/gtk/gtkcssshorthandproperty.c +++ b/gtk/gtkcssshorthandproperty.c @@ -68,10 +68,11 @@ _gtk_css_shorthand_property_assign (GtkStyleProperty *property, GtkStateFlags state, const GValue *value) { + GtkCssShorthandProperty *shorthand = GTK_CSS_SHORTHAND_PROPERTY (property); GParameter *parameters; guint i, n_parameters; - parameters = property->unpack_func (value, &n_parameters); + parameters = shorthand->assign (shorthand, value, &n_parameters); for (i = 0; i < n_parameters; i++) { @@ -90,7 +91,9 @@ _gtk_css_shorthand_property_query (GtkStyleProperty *property, GtkStateFlags state, GValue *value) { - property->pack_func (value, props, state); + GtkCssShorthandProperty *shorthand = GTK_CSS_SHORTHAND_PROPERTY (property); + + shorthand->query (shorthand, value, props, state); } static gboolean |