[gtk+/gtk-style-context: 327/347] Remove GTK_REGION_DEFAULT
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-style-context: 327/347] Remove GTK_REGION_DEFAULT
- Date: Thu, 11 Nov 2010 01:32:00 +0000 (UTC)
commit a1d4884f020424156b532e6f27cd8e76b17f3459
Author: Carlos Garnacho <carlosg gnome org>
Date: Sat Nov 6 12:40:15 2010 +0100
Remove GTK_REGION_DEFAULT
GTK_STYLE_CLASS_DEFAULT is preferred to match a default area, as
it doesn't make sense to have a per-region default.
gtk/gtkcssprovider.c | 5 -----
gtk/gtkenums.h | 2 --
2 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 1af8815..977db0d 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -463,7 +463,6 @@ enum ParserSymbol {
SYMBOL_NTH_CHILD = GTK_STATE_LAST,
SYMBOL_FIRST_CHILD,
SYMBOL_LAST_CHILD,
- SYMBOL_DEFAULT_CHILD,
SYMBOL_SORTED_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, "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, "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_NTH_CHILD, "even", GUINT_TO_POINTER (SYMBOL_NTH_CHILD_EVEN));
@@ -1304,8 +1302,6 @@ parse_nth_child (GtkCssProvider *css_provider,
*flags = GTK_REGION_FIRST;
else if (symbol == SYMBOL_LAST_CHILD)
*flags = GTK_REGION_LAST;
- else if (symbol == SYMBOL_DEFAULT_CHILD)
- *flags = GTK_REGION_DEFAULT;
else if (symbol == SYMBOL_SORTED_CHILD)
*flags = GTK_REGION_SORTED;
else
@@ -1496,7 +1492,6 @@ parse_selector (GtkCssProvider *css_provider,
if (symbol == SYMBOL_FIRST_CHILD ||
symbol == SYMBOL_LAST_CHILD ||
symbol == SYMBOL_NTH_CHILD ||
- symbol == SYMBOL_DEFAULT_CHILD ||
symbol == SYMBOL_SORTED_CHILD)
{
GTokenType token;
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index fa932fa..944b6bb 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -594,7 +594,6 @@ typedef enum
* @GTK_REGION_ODD: Region has an odd number 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_DEFAULT: Region is the default option.
* @GTK_REGION_SORTED: Region is part of a sorted area.
*
* Describes a region within a widget.
@@ -604,7 +603,6 @@ typedef enum {
GTK_REGION_ODD = 1 << 1,
GTK_REGION_FIRST = 1 << 2,
GTK_REGION_LAST = 1 << 3,
- GTK_REGION_DEFAULT = 1 << 4,
GTK_REGION_SORTED = 1 << 5
} GtkRegionFlags;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]