diff options
| -rw-r--r-- | gtk/a11y/Makefile.am | 2 | ||||
| -rw-r--r-- | gtk/a11y/gtkcheckmenuitemaccessible.c | 123 | ||||
| -rw-r--r-- | gtk/a11y/gtkcheckmenuitemaccessible.h | 51 | ||||
| -rw-r--r-- | gtk/gtkcheckmenuitem.c | 1 |
4 files changed, 0 insertions, 177 deletions
diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am index aa66028211..f060e46613 100644 --- a/gtk/a11y/Makefile.am +++ b/gtk/a11y/Makefile.am @@ -10,7 +10,6 @@ gail_c_sources = \ gtkbuttonaccessible.c \ gtkcellaccessible.c \ gtkcellaccessibleparent.c \ - gtkcheckmenuitemaccessible.c \ gtkchecksubmenuitemaccessible.c \ gtkcomboboxaccessible.c \ gtkcontaineraccessible.c \ @@ -59,7 +58,6 @@ gail_private_h_sources = \ gtkbuttonaccessible.h \ gtkcellaccessible.h \ gtkcellaccessibleparent.h \ - gtkcheckmenuitemaccessible.h \ gtkchecksubmenuitemaccessible.h \ gtkcomboboxaccessible.h \ gtkcontaineraccessible.h \ diff --git a/gtk/a11y/gtkcheckmenuitemaccessible.c b/gtk/a11y/gtkcheckmenuitemaccessible.c deleted file mode 100644 index 36627b9245..0000000000 --- a/gtk/a11y/gtkcheckmenuitemaccessible.c +++ /dev/null @@ -1,123 +0,0 @@ -/* GAIL - The GNOME Accessibility Implementation Library - * Copyright 2002, 2003 Sun Microsystems Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include "config.h" - -#include <string.h> -#include "gtkcheckmenuitemaccessible.h" - - -G_DEFINE_TYPE (GtkCheckMenuItemAccessible, _gtk_check_menu_item_accessible, GTK_TYPE_MENU_ITEM_ACCESSIBLE) - -static void -toggled_cb (GtkWidget *widget) -{ - AtkObject *accessible; - GtkCheckMenuItem *check_menu_item; - gboolean active; - - check_menu_item = GTK_CHECK_MENU_ITEM (widget); - active = gtk_check_menu_item_get_active (check_menu_item); - - accessible = gtk_widget_get_accessible (widget); - atk_object_notify_state_change (accessible, ATK_STATE_CHECKED, active); -} - -static void -gtk_check_menu_item_accessible_initialize (AtkObject *obj, - gpointer data) -{ - ATK_OBJECT_CLASS (_gtk_check_menu_item_accessible_parent_class)->initialize (obj, data); - - g_signal_connect (data, "toggled", G_CALLBACK (toggled_cb), NULL); - - obj->role = ATK_ROLE_CHECK_MENU_ITEM; -} - -static AtkStateSet * -gtk_check_menu_item_accessible_ref_state_set (AtkObject *accessible) -{ - AtkStateSet *state_set; - GtkCheckMenuItem *check_menu_item; - GtkWidget *widget; - - widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible)); - if (widget == NULL) - return NULL; - - state_set = ATK_OBJECT_CLASS (_gtk_check_menu_item_accessible_parent_class)->ref_state_set (accessible); - - check_menu_item = GTK_CHECK_MENU_ITEM (widget); - - if (gtk_check_menu_item_get_active (check_menu_item)) - atk_state_set_add_state (state_set, ATK_STATE_CHECKED); - - if (gtk_check_menu_item_get_inconsistent (check_menu_item)) - { - atk_state_set_remove_state (state_set, ATK_STATE_ENABLED); - atk_state_set_add_state (state_set, ATK_STATE_INDETERMINATE); - } - - return state_set; -} - -static void -gtk_check_menu_item_accessible_notify_gtk (GObject *obj, - GParamSpec *pspec) -{ - GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (obj); - AtkObject *atk_obj; - gboolean sensitive; - gboolean inconsistent; - - atk_obj = gtk_widget_get_accessible (GTK_WIDGET (check_menu_item)); - sensitive = gtk_widget_get_sensitive (GTK_WIDGET (check_menu_item)); - inconsistent = gtk_check_menu_item_get_inconsistent (check_menu_item); - - if (strcmp (pspec->name, "inconsistent") == 0) - { - atk_object_notify_state_change (atk_obj, ATK_STATE_INDETERMINATE, inconsistent); - atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); - } - else if (strcmp (pspec->name, "sensitive") == 0) - { - /* Need to override gailwidget behavior of notifying for ENABLED */ - atk_object_notify_state_change (atk_obj, ATK_STATE_SENSITIVE, sensitive); - atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); - } - else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_check_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); -} - -static void -_gtk_check_menu_item_accessible_class_init (GtkCheckMenuItemAccessibleClass *klass) -{ - GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; - AtkObjectClass *class = ATK_OBJECT_CLASS (klass); - - widget_class->notify_gtk = gtk_check_menu_item_accessible_notify_gtk; - - class->ref_state_set = gtk_check_menu_item_accessible_ref_state_set; - class->initialize = gtk_check_menu_item_accessible_initialize; -} - -static void -_gtk_check_menu_item_accessible_init (GtkCheckMenuItemAccessible *item) -{ -} diff --git a/gtk/a11y/gtkcheckmenuitemaccessible.h b/gtk/a11y/gtkcheckmenuitemaccessible.h deleted file mode 100644 index afaa1336c2..0000000000 --- a/gtk/a11y/gtkcheckmenuitemaccessible.h +++ /dev/null @@ -1,51 +0,0 @@ -/* GAIL - The GNOME Accessibility Implementation Library - * Copyright 2002 Sun Microsystems Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__ -#define __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__ - -#include "gtkmenuitemaccessible.h" - -G_BEGIN_DECLS - -#define GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE (_gtk_check_menu_item_accessible_get_type ()) -#define GTK_CHECK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE, GtkCheckMenuItemAccessible)) -#define GTK_CHECK_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE, GtkCheckMenuItemAccessibleClass)) -#define GTK_IS_CHECK_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE)) -#define GTK_IS_CHECK_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE)) -#define GTK_CHECK_MENU_ITEM_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE, GtkCheckMenuItemAccessibleClass)) - -typedef struct _GtkCheckMenuItemAccessible GtkCheckMenuItemAccessible; -typedef struct _GtkCheckMenuItemAccessibleClass GtkCheckMenuItemAccessibleClass; - -struct _GtkCheckMenuItemAccessible -{ - GtkMenuItemAccessible parent; -}; - -struct _GtkCheckMenuItemAccessibleClass -{ - GtkMenuItemAccessibleClass parent_class; -}; - -GType _gtk_check_menu_item_accessible_get_type (void); - -G_END_DECLS - -#endif /* __GTK_CHECK_MENU_ITEM_ACCESSIBLE_H__ */ diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index 66c078fb19..e08f5fb5e3 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -33,7 +33,6 @@ #include "gtkmarshalers.h" #include "gtkprivate.h" #include "gtkintl.h" -#include "a11y/gtkcheckmenuitemaccessible.h" #include "a11y/gtkchecksubmenuitemaccessible.h" /** |