summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk/gtkcssanimatedstyle.c2
-rw-r--r--gtk/gtkcssstyle.c2
-rw-r--r--gtk/gtkcsstransition.c11
-rw-r--r--gtk/gtkstyleanimation.c2
4 files changed, 6 insertions, 11 deletions
diff --git a/gtk/gtkcssanimatedstyle.c b/gtk/gtkcssanimatedstyle.c
index d67bb9f191..c04f040b0b 100644
--- a/gtk/gtkcssanimatedstyle.c
+++ b/gtk/gtkcssanimatedstyle.c
@@ -53,7 +53,7 @@ gtk_css_animated_style_get_section (GtkCssStyle *style,
static gboolean
gtk_css_animated_style_is_static (GtkCssStyle *style)
{
- GtkCssAnimatedStyle *animated = GTK_CSS_ANIMATED_STYLE (style);
+ GtkCssAnimatedStyle *animated = (GtkCssAnimatedStyle *)style;
guint i;
for (i = 0; i < animated->n_animations; i ++)
diff --git a/gtk/gtkcssstyle.c b/gtk/gtkcssstyle.c
index b02c4dd394..8a15649b74 100644
--- a/gtk/gtkcssstyle.c
+++ b/gtk/gtkcssstyle.c
@@ -293,8 +293,6 @@ gtk_css_style_get_section (GtkCssStyle *style,
gboolean
gtk_css_style_is_static (GtkCssStyle *style)
{
- gtk_internal_return_val_if_fail (GTK_IS_CSS_STYLE (style), TRUE);
-
return GTK_CSS_STYLE_GET_CLASS (style)->is_static (style);
}
diff --git a/gtk/gtkcsstransition.c b/gtk/gtkcsstransition.c
index 62731a513d..bb872a0b17 100644
--- a/gtk/gtkcsstransition.c
+++ b/gtk/gtkcsstransition.c
@@ -30,8 +30,7 @@ static GtkStyleAnimation *
gtk_css_transition_advance (GtkStyleAnimation *style_animation,
gint64 timestamp)
{
- GtkCssTransition *source = GTK_CSS_TRANSITION (style_animation);
-
+ GtkCssTransition *source = (GtkCssTransition *)style_animation;
GtkCssTransition *transition;
transition = g_object_new (GTK_TYPE_CSS_TRANSITION, NULL);
@@ -44,14 +43,14 @@ gtk_css_transition_advance (GtkStyleAnimation *style_animation,
gtk_progress_tracker_advance_frame (&transition->tracker, timestamp);
transition->finished = gtk_progress_tracker_get_state (&transition->tracker) == GTK_PROGRESS_STATE_AFTER;
- return GTK_STYLE_ANIMATION (transition);
+ return (GtkStyleAnimation *)transition;
}
static void
gtk_css_transition_apply_values (GtkStyleAnimation *style_animation,
GtkCssAnimatedStyle *style)
{
- GtkCssTransition *transition = GTK_CSS_TRANSITION (style_animation);
+ GtkCssTransition *transition = (GtkCssTransition *)style_animation;
GtkCssValue *value, *end;
double progress;
GtkProgressState state;
@@ -86,7 +85,7 @@ gtk_css_transition_apply_values (GtkStyleAnimation *style_animation,
static gboolean
gtk_css_transition_is_finished (GtkStyleAnimation *animation)
{
- GtkCssTransition *transition = GTK_CSS_TRANSITION (animation);
+ GtkCssTransition *transition = (GtkCssTransition *)animation;
return transition->finished;
}
@@ -94,7 +93,7 @@ gtk_css_transition_is_finished (GtkStyleAnimation *animation)
static gboolean
gtk_css_transition_is_static (GtkStyleAnimation *animation)
{
- GtkCssTransition *transition = GTK_CSS_TRANSITION (animation);
+ GtkCssTransition *transition = (GtkCssTransition *)animation;
return transition->finished;
}
diff --git a/gtk/gtkstyleanimation.c b/gtk/gtkstyleanimation.c
index 89f8319fba..754f09b0c0 100644
--- a/gtk/gtkstyleanimation.c
+++ b/gtk/gtkstyleanimation.c
@@ -117,8 +117,6 @@ _gtk_style_animation_is_static (GtkStyleAnimation *animation)
{
GtkStyleAnimationClass *klass;
- g_return_val_if_fail (GTK_IS_STYLE_ANIMATION (animation), TRUE);
-
klass = GTK_STYLE_ANIMATION_GET_CLASS (animation);
return klass->is_static (animation);