diff options
| -rw-r--r-- | gtk/gtkcsscomputedvalues.c | 29 | ||||
| -rw-r--r-- | gtk/gtkcssvalue.c | 25 |
2 files changed, 28 insertions, 26 deletions
diff --git a/gtk/gtkcsscomputedvalues.c b/gtk/gtkcsscomputedvalues.c index 7ab7035941..f5f515a4a8 100644 --- a/gtk/gtkcsscomputedvalues.c +++ b/gtk/gtkcsscomputedvalues.c @@ -19,6 +19,7 @@ #include "config.h" +#include "gtkprivate.h" #include "gtkcsscomputedvaluesprivate.h" #include "gtkcssanimationprivate.h" @@ -120,9 +121,9 @@ _gtk_css_computed_values_compute_value (GtkCssComputedValues *values, GtkCssDependencies dependencies; GtkCssValue *value; - g_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values)); - g_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider)); - g_return_if_fail (parent_values == NULL || GTK_IS_CSS_COMPUTED_VALUES (parent_values)); + gtk_internal_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values)); + gtk_internal_return_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider)); + gtk_internal_return_if_fail (parent_values == NULL || GTK_IS_CSS_COMPUTED_VALUES (parent_values)); /* http://www.w3.org/TR/css3-cascade/#cascade * Then, for every element, the value for each property can be found @@ -154,8 +155,8 @@ _gtk_css_computed_values_set_animated_value (GtkCssComputedValues *values, guint id, GtkCssValue *value) { - g_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values)); - g_return_if_fail (value != NULL); + gtk_internal_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values)); + gtk_internal_return_if_fail (value != NULL); if (values->animated_values == NULL) values->animated_values = g_ptr_array_new_with_free_func ((GDestroyNotify)_gtk_css_value_unref); @@ -175,7 +176,7 @@ _gtk_css_computed_values_set_value (GtkCssComputedValues *values, GtkCssDependencies dependencies, GtkCssSection *section) { - g_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values)); + gtk_internal_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values)); if (values->values == NULL) values->values = g_ptr_array_new_with_free_func ((GDestroyNotify)_gtk_css_value_unref); @@ -216,7 +217,7 @@ GtkCssValue * _gtk_css_computed_values_get_value (GtkCssComputedValues *values, guint id) { - g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL); + gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL); if (values->animated_values && id < values->animated_values->len && @@ -230,7 +231,7 @@ GtkCssValue * _gtk_css_computed_values_get_intrinsic_value (GtkCssComputedValues *values, guint id) { - g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL); + gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL); if (values->values == NULL || id >= values->values->len) @@ -243,7 +244,7 @@ GtkCssSection * _gtk_css_computed_values_get_section (GtkCssComputedValues *values, guint id) { - g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL); + gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL); if (values->sections == NULL || id >= values->sections->len) @@ -528,8 +529,8 @@ _gtk_css_computed_values_advance (GtkCssComputedValues *values, GSList *list; guint i; - g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL); - g_return_val_if_fail (timestamp >= values->current_time, NULL); + gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL); + gtk_internal_return_val_if_fail (timestamp >= values->current_time, NULL); values->current_time = timestamp; old_computed_values = values->animated_values; @@ -578,7 +579,7 @@ _gtk_css_computed_values_is_static (GtkCssComputedValues *values) { GSList *list; - g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), TRUE); + gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), TRUE); for (list = values->animations; list; list = list->next) { @@ -592,7 +593,7 @@ _gtk_css_computed_values_is_static (GtkCssComputedValues *values) void _gtk_css_computed_values_cancel_animations (GtkCssComputedValues *values) { - g_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values)); + gtk_internal_return_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values)); if (values->animated_values) { @@ -610,7 +611,7 @@ _gtk_css_computed_values_compute_dependencies (GtkCssComputedValues *values, { GtkBitmask *changes; - g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), _gtk_bitmask_new ()); + gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), _gtk_bitmask_new ()); changes = _gtk_bitmask_copy (parent_changes); changes = _gtk_bitmask_intersect (changes, values->depends_on_parent); diff --git a/gtk/gtkcssvalue.c b/gtk/gtkcssvalue.c index c5e5bdcfc1..6d77cf80c9 100644 --- a/gtk/gtkcssvalue.c +++ b/gtk/gtkcssvalue.c @@ -17,6 +17,7 @@ #include "config.h" +#include "gtkprivate.h" #include "gtkcssvalueprivate.h" #include "gtkcsscomputedvaluesprivate.h" @@ -45,7 +46,7 @@ _gtk_css_value_alloc (const GtkCssValueClass *klass, GtkCssValue * _gtk_css_value_ref (GtkCssValue *value) { - g_return_val_if_fail (value != NULL, NULL); + gtk_internal_return_val_if_fail (value != NULL, NULL); g_atomic_int_add (&value->ref_count, 1); @@ -93,10 +94,10 @@ _gtk_css_value_compute (GtkCssValue *value, { GtkCssDependencies fallback; - g_return_val_if_fail (value != NULL, NULL); - g_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL); - g_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL); - g_return_val_if_fail (parent_values == NULL || GTK_IS_CSS_COMPUTED_VALUES (parent_values), NULL); + gtk_internal_return_val_if_fail (value != NULL, NULL); + gtk_internal_return_val_if_fail (GTK_IS_STYLE_PROVIDER_PRIVATE (provider), NULL); + gtk_internal_return_val_if_fail (GTK_IS_CSS_COMPUTED_VALUES (values), NULL); + gtk_internal_return_val_if_fail (parent_values == NULL || GTK_IS_CSS_COMPUTED_VALUES (parent_values), NULL); if (dependencies == NULL) dependencies = &fallback; @@ -109,8 +110,8 @@ gboolean _gtk_css_value_equal (const GtkCssValue *value1, const GtkCssValue *value2) { - g_return_val_if_fail (value1 != NULL, FALSE); - g_return_val_if_fail (value2 != NULL, FALSE); + gtk_internal_return_val_if_fail (value1 != NULL, FALSE); + gtk_internal_return_val_if_fail (value2 != NULL, FALSE); if (value1 == value2) return TRUE; @@ -141,8 +142,8 @@ _gtk_css_value_transition (GtkCssValue *start, guint property_id, double progress) { - g_return_val_if_fail (start != NULL, FALSE); - g_return_val_if_fail (end != NULL, FALSE); + gtk_internal_return_val_if_fail (start != NULL, FALSE); + gtk_internal_return_val_if_fail (end != NULL, FALSE); if (start->class != end->class) return NULL; @@ -155,7 +156,7 @@ _gtk_css_value_to_string (const GtkCssValue *value) { GString *string; - g_return_val_if_fail (value != NULL, NULL); + gtk_internal_return_val_if_fail (value != NULL, NULL); string = g_string_new (NULL); _gtk_css_value_print (value, string); @@ -175,8 +176,8 @@ void _gtk_css_value_print (const GtkCssValue *value, GString *string) { - g_return_if_fail (value != NULL); - g_return_if_fail (string != NULL); + gtk_internal_return_if_fail (value != NULL); + gtk_internal_return_if_fail (string != NULL); value->class->print (value, string); } |