[gtk+/quartz-integration: 483/563] a11y: Remove "press" and "release" actions from buttons

[John Ralls <jralls src gnome org>]

commit 42ee76667940b4bb1e97f2e0d8f0613f058e48e3
Author: Benjamin Otte <otte redhat com>
Date:   Tue Jun 28 19:13:43 2011 +0200

    a11y: Remove "press" and "release" actions from buttons
    
    http://mail.gnome.org/archives/gnome-accessibility-devel/2011-June/msg00020.html
    has some details about this.
    The main problem is that the internal button states get fiddled with and
    that is not a good idea to do from an AT.
    
    Also update tests to reflect that.

 gtk/a11y/gailbutton.c          |   43 +---------------------------------------
 tests/a11y/about.txt           |    6 -----
 tests/a11y/accessible-name.txt |    2 -
 tests/a11y/appchooser.txt      |   10 ---------
 tests/a11y/assistant.txt       |   16 --------------
 tests/a11y/buttons.txt         |    8 -------
 tests/a11y/colorchooser.txt    |    8 -------
 tests/a11y/hello-world.txt     |    2 -
 tests/a11y/link.txt            |    2 -
 tests/a11y/lockbutton.txt      |    2 -
 tests/a11y/notebook.txt        |    4 ---
 tests/a11y/pickers.txt         |    6 -----
 tests/a11y/tree.txt            |    8 -------
 13 files changed, 1 insertions(+), 116 deletions(-)
---
diff --git a/gtk/a11y/gailbutton.c b/gtk/a11y/gailbutton.c
index a15f575..255786e 100644
--- a/gtk/a11y/gailbutton.c
+++ b/gtk/a11y/gailbutton.c
@@ -511,30 +511,6 @@ idle_do_action (gpointer data)
           */
 	  g_signal_emit_by_name (button, "leave");
 	  break;
-	case 1:
-          /* FIXME: Do not access public member
-	  button->in_button = TRUE;
-          */
-	  g_signal_emit_by_name (button, "enter");
-	  /*
-	   * Simulate a button press event. calling gtk_button_pressed() does
-	   * not get the job done for a GtkOptionMenu.  
-	   */
-	  tmp_event.button.type = GDK_BUTTON_PRESS;
-	  tmp_event.button.window = window;
-	  tmp_event.button.button = 1;
-	  tmp_event.button.send_event = TRUE;
-	  tmp_event.button.time = GDK_CURRENT_TIME;
-	  tmp_event.button.axes = NULL;
-	  
-	  gtk_widget_event (widget, &tmp_event);
-	  break;
-	case 2:
-          /* FIXME: Do not access public member
-	  button->in_button = FALSE;
-          */
-	  g_signal_emit_by_name (button, "leave");
-	  break;
 	default:
 	  g_assert_not_reached ();
 	  break;
@@ -547,7 +523,7 @@ idle_do_action (gpointer data)
 static gint
 gail_button_get_n_actions (AtkAction *action)
 {
-  return 3;
+  return 1;
 }
 
 static const gchar*
@@ -639,23 +615,6 @@ gail_button_action_get_name (AtkAction *action,
        */ 
       return_value = "click";
       break;
-    case 1:
-      /*
-       * This action simulates a button press by simulating moving the
-       * mouse into the button followed by pressing the left mouse button.
-       */
-      return_value = "press";
-      break;
-    case 2:
-      /*
-       * This action simulates releasing the left mouse button outside the 
-       * button.
-       *
-       * To simulate releasing the left mouse button inside the button use
-       * the click action.
-       */
-      return_value = "release";
-      break;
     default:
       return_value = NULL;
       break;
diff --git a/tests/a11y/about.txt b/tests/a11y/about.txt
index 0e89431..6bf8e88 100644
--- a/tests/a11y/about.txt
+++ b/tests/a11y/about.txt
@@ -368,8 +368,6 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 keybinding: <Alt>l
-        action 1 name: press
-        action 2 name: release
       Credits
         "toggle button"
         parent: unnamed-GailContainer-7
@@ -417,8 +415,6 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 keybinding: <Alt>r
-        action 1 name: press
-        action 2 name: release
       Close
         "push button"
         parent: unnamed-GailContainer-7
@@ -466,5 +462,3 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 keybinding: <Alt>c
-        action 1 name: press
-        action 2 name: release
diff --git a/tests/a11y/accessible-name.txt b/tests/a11y/accessible-name.txt
index ce590a6..43356e7 100644
--- a/tests/a11y/accessible-name.txt
+++ b/tests/a11y/accessible-name.txt
@@ -52,5 +52,3 @@ window1
     image description: (null)
     <AtkAction>
     action 0 name: click
-    action 1 name: press
-    action 2 name: release
diff --git a/tests/a11y/appchooser.txt b/tests/a11y/appchooser.txt
index ea0ba6c..8368528 100644
--- a/tests/a11y/appchooser.txt
+++ b/tests/a11y/appchooser.txt
@@ -153,8 +153,6 @@ window1
                 image description: (null)
                 <AtkAction>
                 action 0 name: click
-                action 1 name: press
-                action 2 name: release
               
                 "table column header"
                 parent: unnamed-GailTreeView-5
@@ -201,8 +199,6 @@ window1
                 image description: (null)
                 <AtkAction>
                 action 0 name: click
-                action 1 name: press
-                action 2 name: release
               unnamed-GailContainerCell-6
                 "table cell"
                 parent: unnamed-GailTreeView-5
@@ -474,8 +470,6 @@ Click "Show other applications", for more options, or "Find applications online"
             image description: (null)
             <AtkAction>
             action 0 name: click
-            action 1 name: press
-            action 2 name: release
     unnamed-GailContainer-10
       "filler"
       parent: unnamed-GailContainer-0
@@ -532,8 +526,6 @@ Click "Show other applications", for more options, or "Find applications online"
         <AtkAction>
         action 0 name: click
         action 0 keybinding: <Alt>s
-        action 1 name: press
-        action 2 name: release
       Cancel
         "push button"
         parent: unnamed-GailContainer-10
@@ -581,5 +573,3 @@ Click "Show other applications", for more options, or "Find applications online"
         <AtkAction>
         action 0 name: click
         action 0 keybinding: <Alt>c
-        action 1 name: press
-        action 2 name: release
diff --git a/tests/a11y/assistant.txt b/tests/a11y/assistant.txt
index 7c061e5..889f1c5 100644
--- a/tests/a11y/assistant.txt
+++ b/tests/a11y/assistant.txt
@@ -51,8 +51,6 @@ window1
     image description: (null)
     <AtkAction>
     action 0 name: click
-    action 1 name: press
-    action 2 name: release
   button2
     "push button"
     index: 1
@@ -98,8 +96,6 @@ window1
     image description: (null)
     <AtkAction>
     action 0 name: click
-    action 1 name: press
-    action 2 name: release
   unnamed-GailContainer-0
     "filler"
     parent: unnamed-GailContainer-1
@@ -156,8 +152,6 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 keybinding: <Alt>c
-      action 1 name: press
-      action 2 name: release
     Cancel
       "push button"
       parent: unnamed-GailContainer-0
@@ -205,8 +199,6 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 keybinding: <Alt>c
-      action 1 name: press
-      action 2 name: release
     Finish
       "push button"
       parent: unnamed-GailContainer-0
@@ -254,8 +246,6 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 keybinding: <Alt>f
-      action 1 name: press
-      action 2 name: release
     Go Back
       "push button"
       parent: unnamed-GailContainer-0
@@ -303,8 +293,6 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 keybinding: <Alt>b
-      action 1 name: press
-      action 2 name: release
     Continue
       "push button"
       parent: unnamed-GailContainer-0
@@ -352,8 +340,6 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 keybinding: <Alt>o
-      action 1 name: press
-      action 2 name: release
     Apply
       "push button"
       parent: unnamed-GailContainer-0
@@ -401,5 +387,3 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 keybinding: <Alt>a
-      action 1 name: press
-      action 2 name: release
diff --git a/tests/a11y/buttons.txt b/tests/a11y/buttons.txt
index 74fa49f..0f58210 100644
--- a/tests/a11y/buttons.txt
+++ b/tests/a11y/buttons.txt
@@ -76,8 +76,6 @@ window1
       image description: (null)
       <AtkAction>
       action 0 name: click
-      action 1 name: press
-      action 2 name: release
     button3
       "radio button"
       parent: grid1
@@ -126,8 +124,6 @@ window1
       image description: (null)
       <AtkAction>
       action 0 name: click
-      action 1 name: press
-      action 2 name: release
     button2
       "check box"
       parent: grid1
@@ -174,8 +170,6 @@ window1
       image description: (null)
       <AtkAction>
       action 0 name: click
-      action 1 name: press
-      action 2 name: release
     button1
       "toggle button"
       parent: grid1
@@ -222,5 +216,3 @@ window1
       image description: (null)
       <AtkAction>
       action 0 name: click
-      action 1 name: press
-      action 2 name: release
diff --git a/tests/a11y/colorchooser.txt b/tests/a11y/colorchooser.txt
index aeeec2d..a14baf7 100644
--- a/tests/a11y/colorchooser.txt
+++ b/tests/a11y/colorchooser.txt
@@ -121,8 +121,6 @@ window1
               image description: (null)
               <AtkAction>
               action 0 name: click
-              action 1 name: press
-              action 2 name: release
         unnamed-GailContainer-11
           "filler"
           parent: unnamed-GailContainer-2
@@ -1362,8 +1360,6 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 keybinding: <Alt>h
-        action 1 name: press
-        action 2 name: release
       OK
         "push button"
         parent: unnamed-GailContainer-57
@@ -1411,8 +1407,6 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 keybinding: <Alt>o
-        action 1 name: press
-        action 2 name: release
       Cancel
         "push button"
         parent: unnamed-GailContainer-57
@@ -1460,5 +1454,3 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 keybinding: <Alt>c
-        action 1 name: press
-        action 2 name: release
diff --git a/tests/a11y/hello-world.txt b/tests/a11y/hello-world.txt
index 0934131..feb415a 100644
--- a/tests/a11y/hello-world.txt
+++ b/tests/a11y/hello-world.txt
@@ -52,5 +52,3 @@ window1
     image description: (null)
     <AtkAction>
     action 0 name: click
-    action 1 name: press
-    action 2 name: release
diff --git a/tests/a11y/link.txt b/tests/a11y/link.txt
index 89901b8..3dd8a18 100644
--- a/tests/a11y/link.txt
+++ b/tests/a11y/link.txt
@@ -52,7 +52,5 @@ window1
     image description: (null)
     <AtkAction>
     action 0 name: click
-    action 1 name: press
-    action 2 name: release
     <AtkHyperlinkImpl>
     anchors: http://www.gtk.org
diff --git a/tests/a11y/lockbutton.txt b/tests/a11y/lockbutton.txt
index f4e2013..508c966 100644
--- a/tests/a11y/lockbutton.txt
+++ b/tests/a11y/lockbutton.txt
@@ -26,8 +26,6 @@ Click to prevent further changes
     image description: (null)
     <AtkAction>
     action 0 name: click
-    action 1 name: press
-    action 2 name: release
     Lock
       "label"
       parent: button1
diff --git a/tests/a11y/notebook.txt b/tests/a11y/notebook.txt
index 419f3bb..c363093 100644
--- a/tests/a11y/notebook.txt
+++ b/tests/a11y/notebook.txt
@@ -104,8 +104,6 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 keybinding: <Alt>y
-        action 1 name: press
-        action 2 name: release
     Tab 2
       "page tab"
       parent: notebook1
@@ -192,5 +190,3 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 keybinding: <Alt>n
-        action 1 name: press
-        action 2 name: release
diff --git a/tests/a11y/pickers.txt b/tests/a11y/pickers.txt
index 85b80d1..eb04937 100644
--- a/tests/a11y/pickers.txt
+++ b/tests/a11y/pickers.txt
@@ -70,8 +70,6 @@ window1
         image description: (null)
         <AtkAction>
         action 0 name: click
-        action 1 name: press
-        action 2 name: release
       unnamed-GailComboBox-0
         "combo box"
         parent: button4
@@ -176,8 +174,6 @@ window1
       image description: (null)
       <AtkAction>
       action 0 name: click
-      action 1 name: press
-      action 2 name: release
       Sans
         "label"
         parent: button3
@@ -274,8 +270,6 @@ window1
       image description: (null)
       <AtkAction>
       action 0 name: click
-      action 1 name: press
-      action 2 name: release
     button1
       "combo box"
       parent: grid1
diff --git a/tests/a11y/tree.txt b/tests/a11y/tree.txt
index 8963b60..cef7498 100644
--- a/tests/a11y/tree.txt
+++ b/tests/a11y/tree.txt
@@ -70,8 +70,6 @@ window1
       image description: (null)
       <AtkAction>
       action 0 name: click
-      action 1 name: press
-      action 2 name: release
     column 1 description: Column 2
     <column 1 header>
     Column 2
@@ -120,8 +118,6 @@ window1
       image description: (null)
       <AtkAction>
       action 0 name: click
-      action 1 name: press
-      action 2 name: release
     Column 1
       "table column header"
       parent: tree1
@@ -168,8 +164,6 @@ window1
       image description: (null)
       <AtkAction>
       action 0 name: click
-      action 1 name: press
-      action 2 name: release
     Column 2
       "table column header"
       parent: tree1
@@ -216,8 +210,6 @@ window1
       image description: (null)
       <AtkAction>
       action 0 name: click
-      action 1 name: press
-      action 2 name: release
     One
       "table cell"
       parent: tree1