#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;
}
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)));
#include "gtkcssarrayvalueprivate.h"
#include "gtkcssbgsizevalueprivate.h"
#include "gtkcssbordervalueprivate.h"
+#include "gtkcsscolorvalueprivate.h"
#include "gtkcsscornervalueprivate.h"
#include "gtkcsseasevalueprivate.h"
#include "gtkcssenginevalueprivate.h"
#include "gtkcssrgbavalueprivate.h"
#include "gtkcssshadowsvalueprivate.h"
#include "gtkcssstringvalueprivate.h"
-#include "gtksymboliccolorprivate.h"
#include "gtkthemingengine.h"
#include "gtktypebuiltins.h"
#include "gtkwin32themeprivate.h"
color_parse (GtkCssStyleProperty *property,
GtkCssParser *parser)
{
- return _gtk_css_symbolic_value_new (parser);
+ return _gtk_css_color_value_parse (parser);
}
static void
/*** REGISTRATION ***/
-static GtkSymbolicColor *
-gtk_symbolic_color_new_rgba (double red,
- double green,
- double blue,
- double alpha)
-{
- GdkRGBA rgba = { red, green, blue, alpha };
-
- return gtk_symbolic_color_new_literal (&rgba);
-}
-
void
_gtk_css_style_property_init_properties (void)
{
color_parse,
color_query,
color_assign,
- _gtk_css_symbolic_value_new_take_symbolic_color (
- gtk_symbolic_color_new_rgba (1, 1, 1, 1)));
+ _gtk_css_color_value_new_rgba (1, 1, 1, 1));
gtk_css_style_property_register ("font-size",
GTK_CSS_PROPERTY_FONT_SIZE,
G_TYPE_DOUBLE,
color_parse,
color_query,
color_assign,
- _gtk_css_symbolic_value_new_take_symbolic_color (
- gtk_symbolic_color_new_rgba (0, 0, 0, 0)));
+ _gtk_css_color_value_new_rgba (0, 0, 0, 0));
gtk_css_style_property_register ("font-family",
GTK_CSS_PROPERTY_FONT_FAMILY,
color_parse,
color_query,
color_assign,
- _gtk_css_symbolic_value_new_take_symbolic_color (
- gtk_symbolic_color_ref (
- _gtk_symbolic_color_get_current_color ())));
+ _gtk_css_color_value_new_current_color ());
gtk_css_style_property_register ("border-right-color",
GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR,
GDK_TYPE_RGBA,
color_parse,
color_query,
color_assign,
- _gtk_css_symbolic_value_new_take_symbolic_color (
- gtk_symbolic_color_ref (
- _gtk_symbolic_color_get_current_color ())));
+ _gtk_css_color_value_new_current_color ());
gtk_css_style_property_register ("border-bottom-color",
GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR,
GDK_TYPE_RGBA,
color_parse,
color_query,
color_assign,
- _gtk_css_symbolic_value_new_take_symbolic_color (
- gtk_symbolic_color_ref (
- _gtk_symbolic_color_get_current_color ())));
+ _gtk_css_color_value_new_current_color ());
gtk_css_style_property_register ("border-left-color",
GTK_CSS_PROPERTY_BORDER_LEFT_COLOR,
GDK_TYPE_RGBA,
color_parse,
color_query,
color_assign,
- _gtk_css_symbolic_value_new_take_symbolic_color (
- gtk_symbolic_color_ref (
- _gtk_symbolic_color_get_current_color ())));
+ _gtk_css_color_value_new_current_color ());
gtk_css_style_property_register ("outline-color",
GTK_CSS_PROPERTY_OUTLINE_COLOR,
GDK_TYPE_RGBA,
color_parse,
color_query,
color_assign,
- _gtk_css_symbolic_value_new_take_symbolic_color (
- gtk_symbolic_color_ref (
- _gtk_symbolic_color_get_current_color ())));
+ _gtk_css_color_value_new_current_color ());
gtk_css_style_property_register ("background-repeat",
GTK_CSS_PROPERTY_BACKGROUND_REPEAT,