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

cssshorthand: Don't pass base file anymore

Browse Source 
It's part of the parser now.
This commit is contained in:
Benjamin Otte 2012-04-18 21:48:05 +02:00
parent c9f01ffb43
commit cc6c7c5e16
3 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkcssshorthandproperty.c
View File

@ -119,7 +119,7 @@ gtk_css_shorthand_property_parse_value (GtkStyleProperty *property,
data[i] = _gtk_css_inherit_value_new (); data[i] = _gtk_css_inherit_value_new ();
} }
} }
else if (!shorthand->parse (shorthand, data, parser, base)) else if (!shorthand->parse (shorthand, data, parser))
{ {
for (i = 0; i < shorthand->subproperties->len; i++) for (i = 0; i < shorthand->subproperties->len; i++)
{ {

41
gtk/gtkcssshorthandpropertyimpl.c
View File

@ -91,8 +91,7 @@ parse_four_numbers (GtkCssShorthandProperty *shorthand,
static gboolean static gboolean
parse_margin (GtkCssShorthandProperty *shorthand, parse_margin (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
return parse_four_numbers (shorthand, return parse_four_numbers (shorthand,
values, values,
@ -104,8 +103,7 @@ parse_margin (GtkCssShorthandProperty *shorthand,
static gboolean static gboolean
parse_padding (GtkCssShorthandProperty *shorthand, parse_padding (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
return parse_four_numbers (shorthand, return parse_four_numbers (shorthand,
values, values,
@ -118,8 +116,7 @@ parse_padding (GtkCssShorthandProperty *shorthand,
static gboolean static gboolean
parse_border_width (GtkCssShorthandProperty *shorthand, parse_border_width (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
return parse_four_numbers (shorthand, return parse_four_numbers (shorthand,
values, values,
@ -132,8 +129,7 @@ parse_border_width (GtkCssShorthandProperty *shorthand,
static gboolean static gboolean
parse_border_radius (GtkCssShorthandProperty *shorthand, parse_border_radius (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
GtkCssValue *x[4] = { NULL, }, *y[4] = { NULL, }; GtkCssValue *x[4] = { NULL, }, *y[4] = { NULL, };
guint i; guint i;
@ -213,8 +209,7 @@ fail:
static gboolean static gboolean
parse_border_color (GtkCssShorthandProperty *shorthand, parse_border_color (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
guint i; guint i;
@ -239,8 +234,7 @@ parse_border_color (GtkCssShorthandProperty *shorthand,
static gboolean static gboolean
parse_border_style (GtkCssShorthandProperty *shorthand, parse_border_style (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
guint i; guint i;
@ -266,8 +260,7 @@ parse_border_style (GtkCssShorthandProperty *shorthand,
static gboolean static gboolean
parse_border_image (GtkCssShorthandProperty *shorthand, parse_border_image (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
do do
{ {
@ -333,8 +326,7 @@ parse_border_image (GtkCssShorthandProperty *shorthand,
static gboolean static gboolean
parse_border_side (GtkCssShorthandProperty *shorthand, parse_border_side (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
do do
{ {
@ -368,8 +360,7 @@ parse_border_side (GtkCssShorthandProperty *shorthand,
static gboolean static gboolean
parse_border (GtkCssShorthandProperty *shorthand, parse_border (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
do do
{ {
@ -422,8 +413,7 @@ parse_border (GtkCssShorthandProperty *shorthand,
static gboolean static gboolean
parse_font (GtkCssShorthandProperty *shorthand, parse_font (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
PangoFontDescription *desc; PangoFontDescription *desc;
guint mask; guint mask;
@ -467,8 +457,7 @@ parse_font (GtkCssShorthandProperty *shorthand,
static gboolean static gboolean
parse_background (GtkCssShorthandProperty *shorthand, parse_background (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
do do
{ {
@ -526,8 +515,7 @@ parse_background (GtkCssShorthandProperty *shorthand,
static gboolean static gboolean
parse_one_transition (GtkCssShorthandProperty *shorthand, parse_one_transition (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
do do
{ {
@ -579,8 +567,7 @@ parse_one_transition (GtkCssShorthandProperty *shorthand,
static gboolean static gboolean
parse_transition (GtkCssShorthandProperty *shorthand, parse_transition (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
GtkCssValue *step_values[4]; GtkCssValue *step_values[4];
GPtrArray *arrays[4]; GPtrArray *arrays[4];
@ -593,7 +580,7 @@ parse_transition (GtkCssShorthandProperty *shorthand,
} }
do { do {
if (!parse_one_transition (shorthand, step_values, parser, base)) if (!parse_one_transition (shorthand, step_values, parser))
{ {
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {

3
gtk/gtkcssshorthandpropertyprivate.h
View File

@ -40,8 +40,7 @@ typedef struct _GtkCssShorthandPropertyClass GtkCssShorthandPropertyClass;
typedef gboolean (* GtkCssShorthandPropertyParseFunc) (GtkCssShorthandProperty *shorthand, typedef gboolean (* GtkCssShorthandPropertyParseFunc) (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser, GtkCssParser *parser);
GFile *base);
typedef void (* GtkCssShorthandPropertyAssignFunc) (GtkCssShorthandProperty *shorthand, typedef void (* GtkCssShorthandPropertyAssignFunc) (GtkCssShorthandProperty *shorthand,
GtkStyleProperties *props, GtkStyleProperties *props,
GtkStateFlags state, GtkStateFlags state,