callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssstylefuncs: Remove base argument

Browse Source 
The GtkCssParser keeps track of the base file now.
This commit is contained in:
Benjamin Otte
2012-04-18 21:52:36 +02:00
parent cc6c7c5e16
commit 1367ef7e54
6 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkcsscustomproperty.c
View File

@ -69,7 +69,7 @@ gtk_css_custom_property_parse_value (GtkStyleProperty *property,
{ {
g_value_init (&value, gtk_css_custom_property_get_specified_type (custom->pspec)); g_value_init (&value, gtk_css_custom_property_get_specified_type (custom->pspec));
success = _gtk_css_style_parse_value (&value, parser, base); success = _gtk_css_style_parse_value (&value, parser);
} }
if (!success) if (!success)

3
gtk/gtkcssprovider.c
View File

@ -1558,8 +1558,7 @@ gtk_css_provider_get_style_property (GtkStyleProvider *provider,
val->value); val->value);
found = _gtk_css_style_parse_value (value, found = _gtk_css_style_parse_value (value,
scanner->parser, scanner->parser);
NULL);
gtk_css_scanner_destroy (scanner); gtk_css_scanner_destroy (scanner);

29
gtk/gtkcssstylefuncs.c
View File

@ -49,7 +49,6 @@ static GHashTable *print_funcs = NULL;
static GHashTable *compute_funcs = NULL; static GHashTable *compute_funcs = NULL;
typedef gboolean (* GtkStyleParseFunc) (GtkCssParser *parser, typedef gboolean (* GtkStyleParseFunc) (GtkCssParser *parser,
GFile *base,
GValue *value); GValue *value);
typedef void (* GtkStylePrintFunc) (const GValue *value, typedef void (* GtkStylePrintFunc) (const GValue *value,
GString *string); GString *string);
@ -162,7 +161,6 @@ enum_print (int value,
static gboolean static gboolean
rgba_value_parse (GtkCssParser *parser, rgba_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
GtkSymbolicColor *symbolic; GtkSymbolicColor *symbolic;
@ -231,7 +229,6 @@ rgba_value_compute (GtkStyleContext *context,
static gboolean static gboolean
color_value_parse (GtkCssParser *parser, color_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
GtkSymbolicColor *symbolic; GtkSymbolicColor *symbolic;
@ -310,7 +307,6 @@ color_value_compute (GtkStyleContext *context,
static gboolean static gboolean
symbolic_color_value_parse (GtkCssParser *parser, symbolic_color_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
GtkSymbolicColor *symbolic; GtkSymbolicColor *symbolic;
@ -341,7 +337,6 @@ symbolic_color_value_print (const GValue *value,
static gboolean static gboolean
font_description_value_parse (GtkCssParser *parser, font_description_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
PangoFontDescription *font_desc; PangoFontDescription *font_desc;
@ -383,7 +378,6 @@ font_description_value_print (const GValue *value,
static gboolean static gboolean
boolean_value_parse (GtkCssParser *parser, boolean_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
if (_gtk_css_parser_try (parser, "true", TRUE) || if (_gtk_css_parser_try (parser, "true", TRUE) ||
@ -417,14 +411,13 @@ boolean_value_print (const GValue *value,
static gboolean static gboolean
int_value_parse (GtkCssParser *parser, int_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
gint i; gint i;
if (_gtk_css_parser_begins_with (parser, '-')) if (_gtk_css_parser_begins_with (parser, '-'))
{ {
int res = _gtk_win32_theme_int_parse (parser, base, &i); int res = _gtk_win32_theme_int_parse (parser, &i);
if (res >= 0) if (res >= 0)
{ {
g_value_set_int (value, i); g_value_set_int (value, i);
@ -452,7 +445,6 @@ int_value_print (const GValue *value,
static gboolean static gboolean
uint_value_parse (GtkCssParser *parser, uint_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
guint u; guint u;
@ -476,7 +468,6 @@ uint_value_print (const GValue *value,
static gboolean static gboolean
double_value_parse (GtkCssParser *parser, double_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
gdouble d; gdouble d;
@ -500,7 +491,6 @@ double_value_print (const GValue *value,
static gboolean static gboolean
float_value_parse (GtkCssParser *parser, float_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
gdouble d; gdouble d;
@ -524,7 +514,6 @@ float_value_print (const GValue *value,
static gboolean static gboolean
string_value_parse (GtkCssParser *parser, string_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
char *str = _gtk_css_parser_read_string (parser); char *str = _gtk_css_parser_read_string (parser);
@ -545,7 +534,6 @@ string_value_print (const GValue *value,
static gboolean static gboolean
theming_engine_value_parse (GtkCssParser *parser, theming_engine_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
GtkThemingEngine *engine; GtkThemingEngine *engine;
@ -599,7 +587,6 @@ theming_engine_value_print (const GValue *value,
static gboolean static gboolean
border_value_parse (GtkCssParser *parser, border_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
GtkBorder border = { 0, }; GtkBorder border = { 0, };
@ -612,7 +599,7 @@ border_value_parse (GtkCssParser *parser,
{ {
/* These are strictly speaking signed, but we want to be able to use them /* These are strictly speaking signed, but we want to be able to use them
for unsigned types too, as the actual ranges of values make this safe */ for unsigned types too, as the actual ranges of values make this safe */
int res = _gtk_win32_theme_int_parse (parser, base, &numbers[i]); int res = _gtk_win32_theme_int_parse (parser, &numbers[i]);
if (res == 0) /* Parse error, report */ if (res == 0) /* Parse error, report */
return FALSE; return FALSE;
@ -670,7 +657,6 @@ border_value_print (const GValue *value, GString *string)
static gboolean static gboolean
gradient_value_parse (GtkCssParser *parser, gradient_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
GtkGradient *gradient; GtkGradient *gradient;
@ -701,7 +687,6 @@ gradient_value_print (const GValue *value,
static gboolean static gboolean
pattern_value_parse (GtkCssParser *parser, pattern_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
if (_gtk_css_parser_try (parser, "none", TRUE)) if (_gtk_css_parser_try (parser, "none", TRUE))
@ -712,7 +697,7 @@ pattern_value_parse (GtkCssParser *parser,
{ {
g_value_unset (value); g_value_unset (value);
g_value_init (value, GTK_TYPE_GRADIENT); g_value_init (value, GTK_TYPE_GRADIENT);
return gradient_value_parse (parser, base, value); return gradient_value_parse (parser, value);
} }
else else
{ {
@ -852,7 +837,6 @@ pattern_value_compute (GtkStyleContext *context,
static gboolean static gboolean
enum_value_parse (GtkCssParser *parser, enum_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
int v; int v;
@ -875,7 +859,6 @@ enum_value_print (const GValue *value,
static gboolean static gboolean
flags_value_parse (GtkCssParser *parser, flags_value_parse (GtkCssParser *parser,
GFile *base,
GValue *value) GValue *value)
{ {
GFlagsClass *flags_class; GFlagsClass *flags_class;
@ -1027,7 +1010,6 @@ gtk_css_style_funcs_init (void)
* _gtk_css_style_parse_value: * _gtk_css_style_parse_value:
* @value: the value to parse into. Must be a valid initialized #GValue * @value: the value to parse into. Must be a valid initialized #GValue
* @parser: the parser to parse from * @parser: the parser to parse from
* @base: the base URL for @parser
* *
* This is the generic parsing function used for CSS values. If the * This is the generic parsing function used for CSS values. If the
* function fails to parse a value, it will emit an error on @parser, * function fails to parse a value, it will emit an error on @parser,
@ -1037,8 +1019,7 @@ gtk_css_style_funcs_init (void)
**/ **/
gboolean gboolean
_gtk_css_style_parse_value (GValue *value, _gtk_css_style_parse_value (GValue *value,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
GtkStyleParseFunc func; GtkStyleParseFunc func;
@ -1061,7 +1042,7 @@ _gtk_css_style_parse_value (GValue *value,
return FALSE; return FALSE;
} }
return (*func) (parser, base, value); return (*func) (parser, value);
} }
/** /**

3
gtk/gtkcssstylefuncsprivate.h
View File

@ -25,8 +25,7 @@
G_BEGIN_DECLS G_BEGIN_DECLS
gboolean _gtk_css_style_parse_value (GValue *value, gboolean _gtk_css_style_parse_value (GValue *value,
GtkCssParser *parser, GtkCssParser *parser);
GFile *base);
void _gtk_css_style_print_value (const GValue *value, void _gtk_css_style_print_value (const GValue *value,
GString *string); GString *string);
GtkCssValue * _gtk_css_style_compute_value (GtkStyleContext *context, GtkCssValue * _gtk_css_style_compute_value (GtkStyleContext *context,

1
gtk/gtkwin32theme.c
View File

@ -315,7 +315,6 @@ _gtk_win32_theme_part_create_surface (HTHEME theme,
int int
_gtk_win32_theme_int_parse (GtkCssParser *parser, _gtk_win32_theme_int_parse (GtkCssParser *parser,
GFile *base,
int *value) int *value)
{ {
char *class; char *class;

1
gtk/gtkwin32themeprivate.h
View File

@ -49,7 +49,6 @@ cairo_surface_t * _gtk_win32_theme_part_create_surface (HTHEME theme,
int *y_offs_out); int *y_offs_out);
int _gtk_win32_theme_int_parse (GtkCssParser *parser, int _gtk_win32_theme_int_parse (GtkCssParser *parser,
GFile *base,
int *value); int *value);
GtkSymbolicColor *_gtk_win32_theme_color_parse (GtkCssParser *parser); GtkSymbolicColor *_gtk_win32_theme_color_parse (GtkCssParser *parser);
gboolean _gtk_win32_theme_color_resolve (const char *theme_class, gboolean _gtk_win32_theme_color_resolve (const char *theme_class,