Remove property accessible-state; use signal state-change instead Change

* atk/atkobject.[c|h]:
Remove property accessible-state; use signal state-change instead
Change signature of state-change handler to take gboolean as argument
instead of AtkPropertyValues
Update atk_object_notify_state_change() to emit state-change signal

* atk/atkstate.[c|h], docs.atkstate.sgml:
Remove state ATK_STATE_COLLAPSED

diff --git a/ChangeLog b/ChangeLog
index 688324b..d8b5e8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,16 @@
+2001-11-20  Padraig O'Briain  <padraig.obriain@sun.com>
+
+       * atk/atkobject.[c|h]:
+       Remove property accessible-state; use signal state-change instead
+       Change signature of state-change handler to take gboolean as argument
+       instead of AtkPropertyValues
+       Update atk_object_notify_state_change() to emit state-change signal
+
+       * atk/atkstate.[c|h], docs.atkstate.sgml:
+       Remove state ATK_STATE_COLLAPSED
+
 2001-11-19  Bill Haneman <bill.haneman@sun.com>
+
        * atk/atkobject.c:
        * atk/atkstate.c:
        Added state-changed signal to atkobject, in anticipation of 

diff --git a/atk/atkobject.c b/atk/atkobject.c
index 141ac5b..78e5a47 100755 (executable)
--- a/atk/atkobject.c
+++ b/atk/atkobject.c
@@ -47,8 +47,8 @@ enum {
   CHILDREN_CHANGED,
   FOCUS_EVENT,
   PROPERTY_CHANGE,
-  VISIBLE_DATA_CHANGED,
   STATE_CHANGE,
+  VISIBLE_DATA_CHANGED,
   
   LAST_SIGNAL
 };
@@ -102,7 +102,6 @@ static guint atk_object_signals[LAST_SIGNAL] = { 0, };
 static gpointer parent_class = NULL;
 
 static const gchar* atk_object_name_property_name = "accessible-name";
-static const gchar* atk_object_name_property_state = "accessible-state";
 static const gchar* atk_object_name_property_description = "accessible-description";
 static const gchar* atk_object_name_property_parent = "accessible-parent";
 static const gchar* atk_object_name_property_value = "accessible-value";
@@ -193,16 +192,6 @@ atk_object_class_init (AtkObjectClass *klass)
                                                         NULL,
                                                         G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class,
-                                   PROP_STATE,
-                                   g_param_spec_int    (atk_object_name_property_state,
-                                                        "Accessible State Set",
-                                                        "The accessible state set of this object "
-                                                        "or its UI component",
-                                                        0,
-                                                        G_MAXINT,
-                                                        0,
-                                                        G_PARAM_READWRITE));
-  g_object_class_install_property (gobject_class,
                                    PROP_PARENT,
                                    g_param_spec_object (atk_object_name_property_parent,
                                                         "Accessible Parent",
@@ -301,17 +290,19 @@ atk_object_class_init (AtkObjectClass *klass)
                   G_TYPE_NONE, 1,
                   G_TYPE_POINTER);
   /*
-   * The "state_change" signal supports details, one for each accessible state type
+   * The "state_change" signal supports details, one for each accessible 
+   * state type
    * (see atkstate.c).
    */
+  atk_object_signals[STATE_CHANGE] =
     g_signal_new ("state_change",
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED,
                   G_STRUCT_OFFSET (AtkObjectClass, state_change),
                   (GSignalAccumulator) NULL, NULL,
-                  g_cclosure_marshal_VOID__POINTER,
+                  g_cclosure_marshal_VOID__BOOLEAN,
                   G_TYPE_NONE, 1,
-                  G_TYPE_POINTER);
+                  G_TYPE_BOOLEAN);
   atk_object_signals[VISIBLE_DATA_CHANGED] =
     g_signal_new ("visible_data_changed",
                   G_TYPE_FROM_CLASS (klass),
@@ -724,47 +715,16 @@ atk_object_remove_property_change_handler  (AtkObject *accessible,
  * @state: an #AtkState whose state is changed
  * @value : a gboolean which indicates whether the state is being set on or off
  * 
- * Emits a property_change signal for the specified state. 
- * This signal is caught by an #AtkPropertyChangeHandler
+ * Emits a state-change signal for the specified state. 
  **/
 void
 atk_object_notify_state_change (AtkObject *accessible,
                                 AtkState  state,
                                 gboolean  value)
 {
-#define N_TOGGLE_STATES 2
-  AtkPropertyValues  values = { 0, };
-  AtkState toggle_states[N_TOGGLE_STATES] = { ATK_STATE_EXPANDED, 
-                                              ATK_STATE_COLLAPSED };
-  AtkState toggled_states[N_TOGGLE_STATES] = { ATK_STATE_COLLAPSED, 
-                                               ATK_STATE_EXPANDED };
-
-  values.property_name = atk_object_name_property_state;
-  if (value)
-    {
-       gint i;
-
-       g_value_init (&values.new_value, G_TYPE_INT);
-       g_value_set_int (&values.new_value, state);
-
-       for (i = 0; i < N_TOGGLE_STATES; i++)
-         {
-           if (toggle_states[i] == state)
-             {
-               g_value_init (&values.old_value, G_TYPE_INT);
-               g_value_set_int (&values.old_value, toggled_states[i]);
-               break;
-             }
-         }
-    }
-    else
-    {
-       g_value_init (&values.old_value, G_TYPE_INT);
-       g_value_set_int (&values.old_value, state);
-    }
-  g_signal_emit (accessible, atk_object_signals[PROPERTY_CHANGE],
-                 g_quark_from_string (atk_object_name_property_state),
-                 &values, NULL);
+  g_signal_emit (accessible, atk_object_signals[STATE_CHANGE],
+                 g_quark_from_string (atk_state_type_get_name (state)),
+                 value, NULL);
 }
 
 /**

diff --git a/atk/atkobject.h b/atk/atkobject.h
index 2b79df0..8987247 100755 (executable)
--- a/atk/atkobject.h
+++ b/atk/atkobject.h
@@ -349,7 +349,7 @@ void                      (* remove_property_change_handler)     (AtkObject
    * signal for an object.
    */
   gint                    (*state_change)         (AtkObject                  *accessible,
-                                                   AtkPropertyValues          *values);
+                                                   gboolean                   state_set);
   /*
    * The signal handler which is executed when there is a change in the
    * visible data for an object

diff --git a/atk/atkstate.c b/atk/atkstate.c
index 0b2ae7b..673319f 100755 (executable)
--- a/atk/atkstate.c
+++ b/atk/atkstate.c
@@ -31,7 +31,6 @@ static gchar* state_names[NUM_POSSIBLE_STATES] = {
  "armed",
  "busy",
  "checked",
- "collapsed",
  "defunct",
  "editable",
  "enabled",

diff --git a/atk/atkstate.h b/atk/atkstate.h
index 93072f3..ed11a44 100755 (executable)
--- a/atk/atkstate.h
+++ b/atk/atkstate.h
@@ -33,7 +33,6 @@ extern "C" {
  *@ATK_STATE_ARMED: Indicates that the object is armed
  *@ATK_STATE_BUSY: Indicates the current object is busy
  *@ATK_STATE_CHECKED: Indicates this object is currently checked
- *@ATK_STATE_COLLAPSED: Indicates this object is collapsed
  *@ATK_STATE_DEFUNCT: Indicates the user interface object corresponding to this object no longer exists
  *@ATK_STATE_EDITABLE: Indicates the user can change the contents of this object
  *@ATK_STATE_ENABLED: Indicates that this object is enabled
@@ -69,7 +68,6 @@ typedef enum
   ATK_STATE_ARMED,
   ATK_STATE_BUSY,
   ATK_STATE_CHECKED,
-  ATK_STATE_COLLAPSED,
   ATK_STATE_DEFUNCT,
   ATK_STATE_EDITABLE,
   ATK_STATE_ENABLED,

diff --git a/docs/tmpl/atkstate.sgml b/docs/tmpl/atkstate.sgml
index a881058..28087e9 100644 (file)
--- a/docs/tmpl/atkstate.sgml
+++ b/docs/tmpl/atkstate.sgml
@@ -26,7 +26,6 @@ AtkStates.
 @ATK_STATE_ARMED: 
 @ATK_STATE_BUSY: 
 @ATK_STATE_CHECKED: 
-@ATK_STATE_COLLAPSED: 
 @ATK_STATE_DEFUNCT: 
 @ATK_STATE_EDITABLE: 
 @ATK_STATE_ENABLED: