AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-29 02:27:53 +00:00
Code Issues Projects Releases Wiki Activity

styleproperty: Remove base argument

Browse Source 
from _gtk_style_property_parse_value(). The GtkCssParser takes care of
that now.
This commit is contained in:
Benjamin Otte 2012-04-18 22:04:44 +02:00
parent 6ee237ea59
commit a7f238138e
6 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk/gtkcsscustomproperty.c
View File

@ -42,8 +42,7 @@ gtk_css_custom_property_get_specified_type (GParamSpec *pspec)
static GtkCssValue * static GtkCssValue *
gtk_css_custom_property_parse_value (GtkStyleProperty *property, gtk_css_custom_property_parse_value (GtkStyleProperty *property,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
GtkCssCustomProperty *custom = GTK_CSS_CUSTOM_PROPERTY (property); GtkCssCustomProperty *custom = GTK_CSS_CUSTOM_PROPERTY (property);
GValue value = G_VALUE_INIT; GValue value = G_VALUE_INIT;

3
gtk/gtkcssprovider.c
View File

@ -2200,8 +2200,7 @@ parse_declaration (GtkCssScanner *scanner,
gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_VALUE); gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_VALUE);
value = _gtk_style_property_parse_value (property, value = _gtk_style_property_parse_value (property,
scanner->parser, scanner->parser);
gtk_css_scanner_get_base_url (scanner));
if (value == NULL) if (value == NULL)
{ {

3
gtk/gtkcssshorthandproperty.c
View File

@ -86,8 +86,7 @@ _gtk_css_shorthand_property_query (GtkStyleProperty *property,
static GtkCssValue * static GtkCssValue *
gtk_css_shorthand_property_parse_value (GtkStyleProperty *property, gtk_css_shorthand_property_parse_value (GtkStyleProperty *property,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
GtkCssShorthandProperty *shorthand = GTK_CSS_SHORTHAND_PROPERTY (property); GtkCssShorthandProperty *shorthand = GTK_CSS_SHORTHAND_PROPERTY (property);
GtkCssValue **data; GtkCssValue **data;

3
gtk/gtkcssstyleproperty.c
View File

@ -147,8 +147,7 @@ _gtk_css_style_property_query (GtkStyleProperty *property,
static GtkCssValue * static GtkCssValue *
gtk_css_style_property_parse_value (GtkStyleProperty *property, gtk_css_style_property_parse_value (GtkStyleProperty *property,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
GtkCssStyleProperty *style_property = GTK_CSS_STYLE_PROPERTY (property); GtkCssStyleProperty *style_property = GTK_CSS_STYLE_PROPERTY (property);

6
gtk/gtkstyleproperty.c
View File

@ -132,7 +132,6 @@ _gtk_style_property_init (GtkStyleProperty *property)
* _gtk_style_property_parse_value: * _gtk_style_property_parse_value:
* @property: the property * @property: the property
* @parser: the parser to parse from * @parser: the parser to parse from
* @base: the base file for @aprser
* *
* Tries to parse the given @property from the given @parser into * Tries to parse the given @property from the given @parser into
* @value. The type that @value will be assigned is dependant on * @value. The type that @value will be assigned is dependant on
@ -148,8 +147,7 @@ _gtk_style_property_init (GtkStyleProperty *property)
**/ **/
GtkCssValue * GtkCssValue *
_gtk_style_property_parse_value (GtkStyleProperty *property, _gtk_style_property_parse_value (GtkStyleProperty *property,
GtkCssParser *parser, GtkCssParser *parser)
GFile *base)
{ {
GtkStylePropertyClass *klass; GtkStylePropertyClass *klass;
@ -158,7 +156,7 @@ _gtk_style_property_parse_value (GtkStyleProperty *property,
klass = GTK_STYLE_PROPERTY_GET_CLASS (property); klass = GTK_STYLE_PROPERTY_GET_CLASS (property);
return klass->parse_value (property, parser, base); return klass->parse_value (property, parser);
} }
/** /**

6
gtk/gtkstylepropertyprivate.h
View File

@ -58,8 +58,7 @@ struct _GtkStylePropertyClass
GtkStyleQueryFunc query_func, GtkStyleQueryFunc query_func,
gpointer query_data); gpointer query_data);
GtkCssValue * (* parse_value) (GtkStyleProperty * property, GtkCssValue * (* parse_value) (GtkStyleProperty * property,
GtkCssParser *parser, GtkCssParser *parser);
GFile *base);
GHashTable *properties; GHashTable *properties;
}; };
@ -73,8 +72,7 @@ GtkStyleProperty * _gtk_style_property_lookup (const char
const char * _gtk_style_property_get_name (GtkStyleProperty *property); const char * _gtk_style_property_get_name (GtkStyleProperty *property);
GtkCssValue * _gtk_style_property_parse_value (GtkStyleProperty * property, GtkCssValue * _gtk_style_property_parse_value (GtkStyleProperty * property,
GtkCssParser *parser, GtkCssParser *parser);
GFile *base);
GType _gtk_style_property_get_value_type(GtkStyleProperty * property); GType _gtk_style_property_get_value_type(GtkStyleProperty * property);
void _gtk_style_property_query (GtkStyleProperty * property, void _gtk_style_property_query (GtkStyleProperty * property,