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

Remove GTK_REGION_DEFAULT

Browse Source 
GTK_STYLE_CLASS_DEFAULT is preferred to match a default area, as
it doesn't make sense to have a per-region default.
This commit is contained in:
Carlos Garnacho 2010-11-06 12:40:15 +01:00
parent 271145645c
commit 912ad78cc5
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkcssprovider.c
View File

@ -463,7 +463,6 @@ enum ParserSymbol {
SYMBOL_NTH_CHILD = GTK_STATE_LAST, SYMBOL_NTH_CHILD = GTK_STATE_LAST,
SYMBOL_FIRST_CHILD, SYMBOL_FIRST_CHILD,
SYMBOL_LAST_CHILD, SYMBOL_LAST_CHILD,
SYMBOL_DEFAULT_CHILD,
SYMBOL_SORTED_CHILD, SYMBOL_SORTED_CHILD,
/* Scope: nth-child */ /* Scope: nth-child */
@ -691,7 +690,6 @@ create_scanner (void)
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "nth-child", GUINT_TO_POINTER (SYMBOL_NTH_CHILD)); g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "nth-child", GUINT_TO_POINTER (SYMBOL_NTH_CHILD));
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "first-child", GUINT_TO_POINTER (SYMBOL_FIRST_CHILD)); g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "first-child", GUINT_TO_POINTER (SYMBOL_FIRST_CHILD));
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "last-child", GUINT_TO_POINTER (SYMBOL_LAST_CHILD)); g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "last-child", GUINT_TO_POINTER (SYMBOL_LAST_CHILD));
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "default", GUINT_TO_POINTER (SYMBOL_DEFAULT_CHILD));
g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "sorted", GUINT_TO_POINTER (SYMBOL_SORTED_CHILD)); g_scanner_scope_add_symbol (scanner, SCOPE_PSEUDO_CLASS, "sorted", GUINT_TO_POINTER (SYMBOL_SORTED_CHILD));
g_scanner_scope_add_symbol (scanner, SCOPE_NTH_CHILD, "even", GUINT_TO_POINTER (SYMBOL_NTH_CHILD_EVEN)); g_scanner_scope_add_symbol (scanner, SCOPE_NTH_CHILD, "even", GUINT_TO_POINTER (SYMBOL_NTH_CHILD_EVEN));
@ -1304,8 +1302,6 @@ parse_nth_child (GtkCssProvider *css_provider,
*flags = GTK_REGION_FIRST; *flags = GTK_REGION_FIRST;
else if (symbol == SYMBOL_LAST_CHILD) else if (symbol == SYMBOL_LAST_CHILD)
*flags = GTK_REGION_LAST; *flags = GTK_REGION_LAST;
else if (symbol == SYMBOL_DEFAULT_CHILD)
*flags = GTK_REGION_DEFAULT;
else if (symbol == SYMBOL_SORTED_CHILD) else if (symbol == SYMBOL_SORTED_CHILD)
*flags = GTK_REGION_SORTED; *flags = GTK_REGION_SORTED;
else else
@ -1496,7 +1492,6 @@ parse_selector (GtkCssProvider *css_provider,
if (symbol == SYMBOL_FIRST_CHILD || if (symbol == SYMBOL_FIRST_CHILD ||
symbol == SYMBOL_LAST_CHILD || symbol == SYMBOL_LAST_CHILD ||
symbol == SYMBOL_NTH_CHILD || symbol == SYMBOL_NTH_CHILD ||
symbol == SYMBOL_DEFAULT_CHILD ||
symbol == SYMBOL_SORTED_CHILD) symbol == SYMBOL_SORTED_CHILD)
{ {
GTokenType token; GTokenType token;

2
gtk/gtkenums.h
View File

@ -587,7 +587,6 @@ typedef enum
* @GTK_REGION_ODD: Region has an odd number within a set. * @GTK_REGION_ODD: Region has an odd number within a set.
* @GTK_REGION_FIRST: Region is the first one within a set. * @GTK_REGION_FIRST: Region is the first one within a set.
* @GTK_REGION_LAST: Region is the last one within a set. * @GTK_REGION_LAST: Region is the last one within a set.
* @GTK_REGION_DEFAULT: Region is the default option.
* @GTK_REGION_SORTED: Region is part of a sorted area. * @GTK_REGION_SORTED: Region is part of a sorted area.
* *
* Describes a region within a widget. * Describes a region within a widget.
@ -597,7 +596,6 @@ typedef enum {
GTK_REGION_ODD = 1 << 1, GTK_REGION_ODD = 1 << 1,
GTK_REGION_FIRST = 1 << 2, GTK_REGION_FIRST = 1 << 2,
GTK_REGION_LAST = 1 << 3, GTK_REGION_LAST = 1 << 3,
GTK_REGION_DEFAULT = 1 << 4,
GTK_REGION_SORTED = 1 << 5 GTK_REGION_SORTED = 1 << 5
} GtkRegionFlags; } GtkRegionFlags;