#include "gtkcssarrayvalueprivate.h"
#include "gtkcssbgsizevalueprivate.h"
#include "gtkcssbordervalueprivate.h"
+#include "gtkcsscolorvalueprivate.h"
#include "gtkcsscornervalueprivate.h"
#include "gtkcsseasevalueprivate.h"
#include "gtkcssenumvalueprivate.h"
#include "gtkcssstylefuncsprivate.h"
#include "gtkcssvalueprivate.h"
#include "gtkstylepropertiesprivate.h"
-#include "gtksymboliccolorprivate.h"
#include "gtktypebuiltins.h"
/* this is in case round() is not provided by the compiler,
for (i = 0; i < 4; i++)
{
- values[i] = _gtk_css_symbolic_value_new (parser);
+ values[i] = _gtk_css_color_value_parse (parser);
if (values[i] == NULL)
return FALSE;
}
else if (values[2] == NULL)
{
- values[2] = _gtk_css_symbolic_value_new (parser);
+ values[2] = _gtk_css_color_value_parse (parser);
if (values[2] == NULL)
return FALSE;
}
}
else if (!G_IS_VALUE (&values[8]))
{
- values[8] = _gtk_css_symbolic_value_new (parser);
+ values[8] = _gtk_css_color_value_parse (parser);
if (values[8] == NULL)
return FALSE;
values[0] = _gtk_css_image_value_new (image);
}
else if (values[1] == NULL &&
- (value = _gtk_css_position_value_parse (parser)))
+ (value = _gtk_css_position_value_try_parse (parser)))
{
values[1] = value;
value = NULL;
}
else if (values[6] == NULL)
{
- value = _gtk_css_symbolic_value_new (parser);
+ value = _gtk_css_color_value_parse (parser);
if (value == NULL)
values[6] = _gtk_css_value_ref (_gtk_css_style_property_get_initial_value
(_gtk_css_shorthand_property_get_subproperty (shorthand, 6)));
{
g_ptr_array_set_free_func (arrays[i], (GDestroyNotify) _gtk_css_value_unref);
g_ptr_array_unref (arrays[i]);
- return FALSE;
}
+ return FALSE;
}
for (i = 0; i < 6; i++)
{
g_ptr_array_set_free_func (arrays[i], (GDestroyNotify) _gtk_css_value_unref);
g_ptr_array_unref (arrays[i]);
- return FALSE;
}
+ return FALSE;
}
for (i = 0; i < 4; i++)
{
g_ptr_array_set_free_func (arrays[i], (GDestroyNotify) _gtk_css_value_unref);
g_ptr_array_unref (arrays[i]);
- return FALSE;
}
+ return FALSE;
}
for (i = 0; i < 6; i++)