2003-05-20 Padraig O'Briain <padraig.obriain@sun.com>

	* cspi/spi-statetypes.h, cspi/docs/tmpl/spi_stateset.sgml:
	Add SPI_STATE_INDETERMINATE.

	* cspi/spi_accessible.c (spi_state_to_corba): Add support for
	INDETERMINATE.

	* idl/Accessibility_State.idl: Add support for STATE_INDETERMINATE.

	* libspi/stateset.c (init_state_type_tables): Add support for
	INDETERMINATE.

git-svn-id: http://svn.gnome.org/svn/at-spi/trunk@431 e2bd861d-eb25-0410-b326-f6ed22b6b98c

diff --git a/ChangeLog b/ChangeLog
index 30a7522..05a81ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-05-20  Padraig O'Briain <padraig.obriain@sun.com>
+
+       * cspi/spi-statetypes.h, cspi/docs/tmpl/spi_stateset.sgml:
+       Add SPI_STATE_INDETERMINATE.
+
+       * cspi/spi_accessible.c (spi_state_to_corba): Add support for
+       INDETERMINATE.
+
+       * idl/Accessibility_State.idl: Add support for STATE_INDETERMINATE.
+
+       * libspi/stateset.c (init_state_type_tables): Add support for
+       INDETERMINATE.
+
 2003-05-19  Padraig O'Briain <padraig.obriain@sun.com>
 
        * configure: Update versions of atk and gail required.

diff --git a/cspi/spi-statetypes.h b/cspi/spi-statetypes.h
index 97b7f02..025469a 100644 (file)
--- a/cspi/spi-statetypes.h
+++ b/cspi/spi-statetypes.h
@@ -64,6 +64,7 @@ extern "C" {
  * event is sent when children become 'active' (i.e. are selected or navigated 
  * to onscreen).  Used to prevent need to enumerate all children in very large 
  * containers, like tables.
+ *@SPI_STATE_INDETERMINATE: Indicates that a check box is in a state other than checked or not checked.
  *@SPI_STATE_LAST_DEFINED: Not a valid state, used for finding end of enumeration
  *
  *The possibles states of an object.
@@ -101,6 +102,7 @@ typedef enum
   SPI_STATE_VERTICAL,
   SPI_STATE_VISIBLE,
   SPI_STATE_MANAGES_DESCENDANTS, 
+  SPI_STATE_INDETERMINATE, 
   SPI_STATE_LAST_DEFINED
 } AccessibleState;
 

diff --git a/cspi/spi_accessible.c b/cspi/spi_accessible.c
index 1cffc74..4530e7e 100644 (file)
--- a/cspi/spi_accessible.c
+++ b/cspi/spi_accessible.c
@@ -1146,6 +1146,7 @@ spi_state_to_corba (AccessibleState state)
       MAP_STATE (VERTICAL);
       MAP_STATE (VISIBLE);
       MAP_STATE (MANAGES_DESCENDANTS);
+      MAP_STATE (INDETERMINATE);
     default:
       return Accessibility_STATE_INVALID;
   }

diff --git a/docs/reference/cspi/tmpl/spi_stateset.sgml b/docs/reference/cspi/tmpl/spi_stateset.sgml
index bf2e5a5..29de23c 100644 (file)
--- a/docs/reference/cspi/tmpl/spi_stateset.sgml
+++ b/docs/reference/cspi/tmpl/spi_stateset.sgml
@@ -49,6 +49,7 @@ State and StateSets
 @SPI_STATE_VERTICAL: 
 @SPI_STATE_VISIBLE: 
 @SPI_STATE_MANAGES_DESCENDANTS: 
+@SPI_STATE_INCONSISTENT: 
 @SPI_STATE_LAST_DEFINED: 
 
 <!-- ##### STRUCT AccessibleStateSet ##### -->

diff --git a/idl/Accessibility_State.idl b/idl/Accessibility_State.idl
index eea5ab5..9c43288 100644 (file)
--- a/idl/Accessibility_State.idl
+++ b/idl/Accessibility_State.idl
@@ -115,6 +115,10 @@ module Accessibility {
    * tables.
    */
   STATE_MANAGES_DESCENDANTS,
+  /*
+   * Indicates that a check box is in a state other than checked or not checked.
+   */
+  STATE_INDETERMINATE,
 
   STATE_LAST_DEFINED
   };

diff --git a/libspi/stateset.c b/libspi/stateset.c
index 491881d..bf2a762 100644 (file)
--- a/libspi/stateset.c
+++ b/libspi/stateset.c
@@ -114,6 +114,8 @@ spi_init_state_type_tables (void)
   atk_state_types[Accessibility_STATE_VISIBLE] = ATK_STATE_VISIBLE;
   accessible_state_types[ATK_STATE_MANAGES_DESCENDANTS] = Accessibility_STATE_MANAGES_DESCENDANTS;
   atk_state_types[Accessibility_STATE_MANAGES_DESCENDANTS] = ATK_STATE_MANAGES_DESCENDANTS;
+  accessible_state_types[ATK_STATE_INDETERMINATE] = Accessibility_STATE_INDETERMINATE;
+  atk_state_types[Accessibility_STATE_INDETERMINATE] = ATK_STATE_INDETERMINATE;
 
   return TRUE;
 }
@@ -353,6 +355,8 @@ impl_getStates (PortableServer_Servant servant,
     states = g_slist_append (states, (gpointer) Accessibility_STATE_VISIBLE);
   if (atk_state_set_contains_state (set, ATK_STATE_MANAGES_DESCENDANTS))
     states = g_slist_append (states, (gpointer) Accessibility_STATE_MANAGES_DESCENDANTS);
+  if (atk_state_set_contains_state (set, ATK_STATE_INDETERMINATE))
+    states = g_slist_append (states, (gpointer) Accessibility_STATE_INDETERMINATE);
 
   rv = Accessibility_StateSeq__alloc ();
   rv->_length = rv->_maximum = g_slist_length (states);