summaryrefslogtreecommitdiff
path: root/gtk/gtkcssanimatedstyleprivate.h
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2014-12-15 01:58:11 +0100
committerBenjamin Otte <otte@redhat.com>2015-01-07 14:26:47 +0100
commit980923c761a7f38197817cfa9168e8b78f1a73ac (patch)
tree08b47d43abddd20c932dcf2d477655094ce43230 /gtk/gtkcssanimatedstyleprivate.h
parent0bab285fe0f5ce4accec8b941742306ef54f4655 (diff)
downloadgtk+-980923c761a7f38197817cfa9168e8b78f1a73ac.tar.gz
cssanimatedstyle: Merge two functions
Diffstat (limited to 'gtk/gtkcssanimatedstyleprivate.h')
-rw-r--r--gtk/gtkcssanimatedstyleprivate.h13
1 files changed, 6 insertions, 7 deletions
diff --git a/gtk/gtkcssanimatedstyleprivate.h b/gtk/gtkcssanimatedstyleprivate.h
index 7e05ef8c8f..e3db40c332 100644
--- a/gtk/gtkcssanimatedstyleprivate.h
+++ b/gtk/gtkcssanimatedstyleprivate.h
@@ -52,7 +52,12 @@ struct _GtkCssAnimatedStyleClass
GType gtk_css_animated_style_get_type (void) G_GNUC_CONST;
-GtkCssStyle * gtk_css_animated_style_new (GtkCssStyle *style);
+GtkCssStyle * gtk_css_animated_style_new (GtkCssStyle *base_style,
+ GtkCssStyle *parent_style,
+ gint64 timestamp,
+ GtkStyleProviderPrivate *provider,
+ int scale,
+ GtkCssStyle *previous_style);
void gtk_css_animated_style_set_animated_value(GtkCssAnimatedStyle *style,
guint id,
@@ -61,12 +66,6 @@ void gtk_css_animated_style_set_animated_value(GtkCssAnimated
GtkCssValue * gtk_css_animated_style_get_intrinsic_value (GtkCssAnimatedStyle *style,
guint id);
-void gtk_css_animated_style_create_animations(GtkCssAnimatedStyle *style,
- GtkCssStyle *parent_style,
- gint64 timestamp,
- GtkStyleProviderPrivate*provider,
- int scale,
- GtkCssStyle *source);
GtkBitmask * gtk_css_animated_style_advance (GtkCssAnimatedStyle *style,
gint64 timestamp);
void gtk_css_animated_style_cancel_animations(GtkCssAnimatedStyle *style);