From 5db6c4b038ac8bd74d6a1672015bbf57a2ec3a81 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 10 Oct 2020 11:16:47 -0400
Subject: [PATCH] Move atspi enums to gtkatspiprivate.h

---
 gtk/a11y/gtkatspicontext.c | 48 -------------------------------------
 gtk/a11y/gtkatspiprivate.h | 49 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/gtk/a11y/gtkatspicontext.c b/gtk/a11y/gtkatspicontext.c
index 0960962a9a..32b85ffabd 100644
--- a/gtk/a11y/gtkatspicontext.c
+++ b/gtk/a11y/gtkatspicontext.c
@@ -78,54 +78,6 @@ static GParamSpec *obj_props[N_PROPS];
 
 G_DEFINE_TYPE (GtkAtSpiContext, gtk_at_spi_context, GTK_TYPE_AT_CONTEXT)
 
-enum {
-  ATSPI_STATE_INVALID,
-  ATSPI_STATE_ACTIVE,
-  ATSPI_STATE_ARMED,
-  ATSPI_STATE_BUSY,
-  ATSPI_STATE_CHECKED,
-  ATSPI_STATE_COLLAPSED,
-  ATSPI_STATE_DEFUNCT,
-  ATSPI_STATE_EDITABLE,
-  ATSPI_STATE_ENABLED,
-  ATSPI_STATE_EXPANDABLE,
-  ATSPI_STATE_EXPANDED,
-  ATSPI_STATE_FOCUSABLE,
-  ATSPI_STATE_FOCUSED,
-  ATSPI_STATE_HAS_TOOLTIP,
-  ATSPI_STATE_HORIZONTAL,
-  ATSPI_STATE_ICONIFIED,
-  ATSPI_STATE_MODAL,
-  ATSPI_STATE_MULTI_LINE,
-  ATSPI_STATE_MULTISELECTABLE,
-  ATSPI_STATE_OPAQUE,
-  ATSPI_STATE_PRESSED,
-  ATSPI_STATE_RESIZABLE,
-  ATSPI_STATE_SELECTABLE,
-  ATSPI_STATE_SELECTED,
-  ATSPI_STATE_SENSITIVE,
-  ATSPI_STATE_SHOWING,
-  ATSPI_STATE_SINGLE_LINE,
-  ATSPI_STATE_STALE,
-  ATSPI_STATE_TRANSIENT,
-  ATSPI_STATE_VERTICAL,
-  ATSPI_STATE_VISIBLE,
-  ATSPI_STATE_MANAGES_DESCENDANTS,
-  ATSPI_STATE_INDETERMINATE,
-  ATSPI_STATE_REQUIRED,
-  ATSPI_STATE_TRUNCATED,
-  ATSPI_STATE_ANIMATED,
-  ATSPI_STATE_INVALID_ENTRY,
-  ATSPI_STATE_SUPPORTS_AUTOCOMPLETION,
-  ATSPI_STATE_SELECTABLE_TEXT,
-  ATSPI_STATE_IS_DEFAULT,
-  ATSPI_STATE_VISITED,
-  ATSPI_STATE_CHECKABLE,
-  ATSPI_STATE_HAS_POPUP,
-  ATSPI_STATE_READ_ONLY,
-  ATSPI_STATE_LAST_DEFINED,
-};
-
 static void
 collect_states (GtkAtSpiContext    *self,
                 GVariantBuilder *builder)
diff --git a/gtk/a11y/gtkatspiprivate.h b/gtk/a11y/gtkatspiprivate.h
index 5a047efca8..4427463360 100644
--- a/gtk/a11y/gtkatspiprivate.h
+++ b/gtk/a11y/gtkatspiprivate.h
@@ -157,4 +157,53 @@ typedef enum {
   ATSPI_ROLE_LAST_DEFINED,
 } AtspiRole;
 
+typedef enum {
+  ATSPI_STATE_INVALID,
+  ATSPI_STATE_ACTIVE,
+  ATSPI_STATE_ARMED,
+  ATSPI_STATE_BUSY,
+  ATSPI_STATE_CHECKED,
+  ATSPI_STATE_COLLAPSED,
+  ATSPI_STATE_DEFUNCT,
+  ATSPI_STATE_EDITABLE,
+  ATSPI_STATE_ENABLED,
+  ATSPI_STATE_EXPANDABLE,
+  ATSPI_STATE_EXPANDED,
+  ATSPI_STATE_FOCUSABLE,
+  ATSPI_STATE_FOCUSED,
+  ATSPI_STATE_HAS_TOOLTIP,
+  ATSPI_STATE_HORIZONTAL,
+  ATSPI_STATE_ICONIFIED,
+  ATSPI_STATE_MODAL,
+  ATSPI_STATE_MULTI_LINE,
+  ATSPI_STATE_MULTISELECTABLE,
+  ATSPI_STATE_OPAQUE,
+  ATSPI_STATE_PRESSED,
+  ATSPI_STATE_RESIZABLE,
+  ATSPI_STATE_SELECTABLE,
+  ATSPI_STATE_SELECTED,
+  ATSPI_STATE_SENSITIVE,
+  ATSPI_STATE_SHOWING,
+  ATSPI_STATE_SINGLE_LINE,
+  ATSPI_STATE_STALE,
+  ATSPI_STATE_TRANSIENT,
+  ATSPI_STATE_VERTICAL,
+  ATSPI_STATE_VISIBLE,
+  ATSPI_STATE_MANAGES_DESCENDANTS,
+  ATSPI_STATE_INDETERMINATE,
+  ATSPI_STATE_REQUIRED,
+  ATSPI_STATE_TRUNCATED,
+  ATSPI_STATE_ANIMATED,
+  ATSPI_STATE_INVALID_ENTRY,
+  ATSPI_STATE_SUPPORTS_AUTOCOMPLETION,
+  ATSPI_STATE_SELECTABLE_TEXT,
+  ATSPI_STATE_IS_DEFAULT,
+  ATSPI_STATE_VISITED,
+  ATSPI_STATE_CHECKABLE,
+  ATSPI_STATE_HAS_POPUP,
+  ATSPI_STATE_READ_ONLY,
+  ATSPI_STATE_LAST_DEFINED,
+} AtspiStateType;
+
+
 G_END_DECLS