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

styleproperty: Use the new flags for inheritance

Browse Source 
Instead of gtk_style_param_set_inherit()
This commit is contained in:
Benjamin Otte 2011-05-31 12:35:42 +02:00
parent 4feddc6190
commit 9f0e993b60
1 changed files with 79 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
gtk/gtkstyleproperty.c
View File

@ -1988,8 +1988,6 @@ _gtk_style_property_pack (const GtkStyleProperty *property,
static void static void
gtk_style_property_init (void) gtk_style_property_init (void)
{ {
GParamSpec *pspec;
if (G_LIKELY (properties)) if (G_LIKELY (properties))
return; return;
@ -1999,12 +1997,17 @@ gtk_style_property_init (void)
/* note that gtk_style_properties_register_property() calls this function, /* note that gtk_style_properties_register_property() calls this function,
* so make sure we're sanely inited to avoid infloops */ * so make sure we're sanely inited to avoid infloops */
pspec = g_param_spec_boxed ("color", _gtk_style_property_register (g_param_spec_boxed ("color",
"Foreground color", "Foreground color",
"Foreground color", "Foreground color",
GDK_TYPE_RGBA, 0); GDK_TYPE_RGBA, 0),
gtk_style_param_set_inherit (pspec, TRUE); GTK_STYLE_PROPERTY_INHERIT,
gtk_style_properties_register_property (NULL, pspec); NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
gtk_style_properties_register_property (NULL, gtk_style_properties_register_property (NULL,
g_param_spec_boxed ("background-color", g_param_spec_boxed ("background-color",
@ -2012,54 +2015,70 @@ gtk_style_property_init (void)
"Background color", "Background color",
GDK_TYPE_RGBA, 0)); GDK_TYPE_RGBA, 0));
pspec = g_param_spec_boxed ("font-family", _gtk_style_property_register (g_param_spec_boxed ("font-family",
"Font family", "Font family",
"Font family", "Font family",
G_TYPE_STRV, 0); G_TYPE_STRV, 0),
gtk_style_param_set_inherit (pspec, TRUE); GTK_STYLE_PROPERTY_INHERIT,
_gtk_style_property_register (pspec,
0,
NULL, NULL,
NULL, NULL,
NULL, NULL,
font_family_parse, font_family_parse,
font_family_value_print, font_family_value_print,
NULL); NULL);
pspec = g_param_spec_enum ("font-style", _gtk_style_property_register (g_param_spec_enum ("font-style",
"Font style", "Font style",
"Font style", "Font style",
PANGO_TYPE_STYLE, PANGO_TYPE_STYLE,
PANGO_STYLE_NORMAL, 0); PANGO_STYLE_NORMAL, 0),
gtk_style_param_set_inherit (pspec, TRUE); GTK_STYLE_PROPERTY_INHERIT,
gtk_style_properties_register_property (NULL, pspec); NULL,
pspec = g_param_spec_enum ("font-variant", NULL,
"Font variant", NULL,
"Font variant", NULL,
PANGO_TYPE_VARIANT, NULL,
PANGO_VARIANT_NORMAL, 0); NULL);
gtk_style_param_set_inherit (pspec, TRUE); _gtk_style_property_register (g_param_spec_enum ("font-variant",
gtk_style_properties_register_property (NULL, pspec); "Font variant",
"Font variant",
PANGO_TYPE_VARIANT,
PANGO_VARIANT_NORMAL, 0),
GTK_STYLE_PROPERTY_INHERIT,
NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
/* xxx: need to parse this properly, ie parse the numbers */ /* xxx: need to parse this properly, ie parse the numbers */
pspec = g_param_spec_enum ("font-weight", _gtk_style_property_register (g_param_spec_enum ("font-weight",
"Font weight", "Font weight",
"Font weight", "Font weight",
PANGO_TYPE_WEIGHT, PANGO_TYPE_WEIGHT,
PANGO_WEIGHT_NORMAL, 0); PANGO_WEIGHT_NORMAL, 0),
gtk_style_param_set_inherit (pspec, TRUE); GTK_STYLE_PROPERTY_INHERIT,
gtk_style_properties_register_property (NULL, pspec); NULL,
pspec = g_param_spec_double ("font-size", NULL,
"Font size", NULL,
"Font size", NULL,
0, G_MAXDOUBLE, 0, 0); NULL,
gtk_style_param_set_inherit (pspec, TRUE); NULL);
gtk_style_properties_register_property (NULL, pspec); _gtk_style_property_register (g_param_spec_double ("font-size",
pspec = g_param_spec_boxed ("font", "Font size",
"Font Description", "Font size",
"Font Description", 0, G_MAXDOUBLE, 0, 0),
PANGO_TYPE_FONT_DESCRIPTION, 0); GTK_STYLE_PROPERTY_INHERIT,
gtk_style_param_set_inherit (pspec, TRUE); NULL,
_gtk_style_property_register (pspec, NULL,
0, NULL,
NULL,
NULL,
NULL);
_gtk_style_property_register (g_param_spec_boxed ("font",
"Font Description",
"Font Description",
PANGO_TYPE_FONT_DESCRIPTION, 0),
GTK_STYLE_PROPERTY_INHERIT,
NULL, NULL,
unpack_font_description, unpack_font_description,
pack_font_description, pack_font_description,
@ -2067,12 +2086,17 @@ gtk_style_property_init (void)
font_description_value_print, font_description_value_print,
NULL); NULL);
pspec = g_param_spec_boxed ("text-shadow", _gtk_style_property_register (g_param_spec_boxed ("text-shadow",
"Text shadow", "Text shadow",
"Text shadow", "Text shadow",
GTK_TYPE_SHADOW, 0); GTK_TYPE_SHADOW, 0),
gtk_style_param_set_inherit (pspec, TRUE); GTK_STYLE_PROPERTY_INHERIT,
gtk_style_properties_register_property (NULL, pspec); NULL,
NULL,
NULL,
NULL,
NULL,
NULL);
gtk_style_properties_register_property (NULL, gtk_style_properties_register_property (NULL,
g_param_spec_int ("margin-top", g_param_spec_int ("margin-top",