AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

a11y: Use gtk_button_clicked() to click a button.

Browse Source 
Don't fiddle with events.
This commit is contained in:
Benjamin Otte 2011-06-28 19:21:19 +02:00 committed by Matthias Clasen
parent 6b02119bb1
commit 7c00940470
1 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gtk/a11y/gailbutton.c
View File

@ -451,31 +451,16 @@ idle_do_action (gpointer data)
GtkButton *button; GtkButton *button;
GtkWidget *widget; GtkWidget *widget;
GailButton *gail_button; GailButton *gail_button;
GdkEvent tmp_event;
GdkWindow *window;
gail_button = GAIL_BUTTON (data); gail_button = GAIL_BUTTON (data);
gail_button->action_idle_handler = 0; gail_button->action_idle_handler = 0;
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (gail_button)); widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (gail_button));
window = gtk_widget_get_window (widget);
tmp_event.button.type = GDK_BUTTON_RELEASE;
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;
g_object_ref (gail_button);
if (widget == NULL /* State is defunct */ || if (widget == NULL /* State is defunct */ ||
!gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget)) !gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget))
{ return FALSE;
g_object_unref (gail_button);
return FALSE; g_object_ref (gail_button);
}
else
gtk_widget_event (widget, &tmp_event);
button = GTK_BUTTON (widget); button = GTK_BUTTON (widget);
while (!g_queue_is_empty (gail_button->action_queue)) while (!g_queue_is_empty (gail_button->action_queue))
@ -484,32 +469,7 @@ idle_do_action (gpointer data)
switch (action_number) switch (action_number)
{ {
case 0: case 0:
/* first a press */ gtk_button_clicked (button);
/* 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);
/* then a release */
tmp_event.button.type = GDK_BUTTON_RELEASE;
gtk_widget_event (widget, &tmp_event);
/* FIXME: Do not access public member
button->in_button = FALSE;
*/
g_signal_emit_by_name (button, "leave");
break; break;
default: default:
g_assert_not_reached (); g_assert_not_reached ();