AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

shorthand: shorthands can't be inherited

Browse Source 
... so remove the flag handling.
This commit is contained in:
Benjamin Otte 2011-12-31 19:58:44 +01:00
parent 544d210a61
commit d9c5d37e56
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkcssshorthandpropertyimpl.c
View File

@ -768,7 +768,6 @@ unset_border_image (GtkStyleProperties *props,
static void static void
_gtk_css_shorthand_property_register (GParamSpec *pspec, _gtk_css_shorthand_property_register (GParamSpec *pspec,
const char **subproperties, const char **subproperties,
GtkStylePropertyFlags flags,
GtkStylePropertyParser property_parse_func, GtkStylePropertyParser property_parse_func,
GtkStyleUnpackFunc unpack_func, GtkStyleUnpackFunc unpack_func,
GtkStylePackFunc pack_func, GtkStylePackFunc pack_func,
@ -788,7 +787,6 @@ _gtk_css_shorthand_property_register (GParamSpec *pspec,
"subproperties", subproperties, "subproperties", subproperties,
NULL); NULL);
node->flags = flags;
node->pspec = pspec; node->pspec = pspec;
node->property_parse_func = property_parse_func; node->property_parse_func = property_parse_func;
node->pack_func = pack_func; node->pack_func = pack_func;
@ -815,7 +813,6 @@ _gtk_css_shorthand_property_init_properties (void)
"Font Description", "Font Description",
PANGO_TYPE_FONT_DESCRIPTION, 0), PANGO_TYPE_FONT_DESCRIPTION, 0),
font_subproperties, font_subproperties,
GTK_STYLE_PROPERTY_INHERIT,
NULL, NULL,
unpack_font_description, unpack_font_description,
pack_font_description, pack_font_description,
@ -828,7 +825,6 @@ _gtk_css_shorthand_property_init_properties (void)
"Margin", "Margin",
GTK_TYPE_BORDER, 0), GTK_TYPE_BORDER, 0),
margin_subproperties, margin_subproperties,
0,
NULL, NULL,
unpack_margin, unpack_margin,
pack_margin, pack_margin,
@ -841,7 +837,6 @@ _gtk_css_shorthand_property_init_properties (void)
"Padding", "Padding",
GTK_TYPE_BORDER, 0), GTK_TYPE_BORDER, 0),
padding_subproperties, padding_subproperties,
0,
NULL, NULL,
unpack_padding, unpack_padding,
pack_padding, pack_padding,
@ -854,7 +849,6 @@ _gtk_css_shorthand_property_init_properties (void)
"Border width, in pixels", "Border width, in pixels",
GTK_TYPE_BORDER, 0), GTK_TYPE_BORDER, 0),
border_width_subproperties, border_width_subproperties,
0,
NULL, NULL,
unpack_border_width, unpack_border_width,
pack_border_width, pack_border_width,
@ -867,7 +861,6 @@ _gtk_css_shorthand_property_init_properties (void)
"Border radius, in pixels", "Border radius, in pixels",
0, G_MAXINT, 0, 0), 0, G_MAXINT, 0, 0),
border_radius_subproperties, border_radius_subproperties,
0,
NULL, NULL,
unpack_border_radius, unpack_border_radius,
pack_border_radius, pack_border_radius,
@ -880,7 +873,6 @@ _gtk_css_shorthand_property_init_properties (void)
"Border color", "Border color",
GDK_TYPE_RGBA, 0), GDK_TYPE_RGBA, 0),
border_color_subproperties, border_color_subproperties,
0,
NULL, NULL,
unpack_border_color, unpack_border_color,
pack_border_color, pack_border_color,
@ -893,7 +885,6 @@ _gtk_css_shorthand_property_init_properties (void)
"Border Image", "Border Image",
GTK_TYPE_BORDER_IMAGE, 0), GTK_TYPE_BORDER_IMAGE, 0),
border_image_subproperties, border_image_subproperties,
0,
NULL, NULL,
_gtk_border_image_unpack, _gtk_border_image_unpack,
_gtk_border_image_pack, _gtk_border_image_pack,