Remove GTK_STATE_LAST.

It didn't turn out to be that useful, nor widely used.

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 99776cf475508350d7369dd119097ffb4440ff6b..69594a141465b786728a7376b07e6353ee8d46e9 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -460,7 +460,7 @@ enum ParserScope {
  */
 enum ParserSymbol {
   /* Scope: pseudo-class */
-  SYMBOL_NTH_CHILD = GTK_STATE_LAST,
+  SYMBOL_NTH_CHILD = GTK_STATE_FOCUSED + 1,
   SYMBOL_FIRST_CHILD,
   SYMBOL_LAST_CHILD,
   SYMBOL_SORTED_CHILD,

diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index cc66e3904c0305ae8dde35d6f61a536aa9bd7538..7393a7a2d1bdeb4e3aed76973a456a8ea65b276b 100644 (file)
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -369,8 +369,7 @@ typedef enum
   GTK_STATE_SELECTED,
   GTK_STATE_INSENSITIVE,
   GTK_STATE_INCONSISTENT,
-  GTK_STATE_FOCUSED,
-  GTK_STATE_LAST
+  GTK_STATE_FOCUSED
 } GtkStateType;
 
 /* Style for toolbars */

diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
index 75543228486ae4ffa430d8c0ddb8bd10468e386d..e465a1bd876cbc7a3a2b6b51352591a7a0ef1773 100644 (file)
--- a/gtk/gtkstylecontext.c
+++ b/gtk/gtkstylecontext.c
@@ -2464,7 +2464,7 @@ gtk_style_context_notify_state_change (GtkStyleContext *context,
 
   g_return_if_fail (GTK_IS_STYLE_CONTEXT (context));
   g_return_if_fail (GDK_IS_WINDOW (window));
-  g_return_if_fail (state < GTK_STATE_LAST);
+  g_return_if_fail (state > GTK_STATE_NORMAL && state <= GTK_STATE_FOCUSED);
 
   priv = context->priv;
   g_return_if_fail (priv->widget_path != NULL);