From 438b78a27dae69eebd14bf2fd59137962d4cae79 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 18 Jul 2011 18:46:30 +0200 Subject: [PATCH] a11y: Remove gtkradiomenuitemaccessible.[ch] We use gtkradiosubmenuitemaccessible exclusively these days. --- gtk/a11y/Makefile.am | 2 - gtk/a11y/gtkradiomenuitemaccessible.c | 112 -------------------------- gtk/a11y/gtkradiomenuitemaccessible.h | 53 ------------ gtk/gtkradiomenuitem.c | 1 - 4 files changed, 168 deletions(-) delete mode 100644 gtk/a11y/gtkradiomenuitemaccessible.c delete mode 100644 gtk/a11y/gtkradiomenuitemaccessible.h diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am index 62334f644..2d9796273 100644 --- a/gtk/a11y/Makefile.am +++ b/gtk/a11y/Makefile.am @@ -30,7 +30,6 @@ gail_c_sources = \ gtkpanedaccessible.c \ gtkprogressbaraccessible.c \ gtkradiobuttonaccessible.c \ - gtkradiomenuitemaccessible.c \ gtkradiosubmenuitemaccessible.c \ gtkrangeaccessible.c \ gtkrenderercellaccessible.c \ @@ -80,7 +79,6 @@ gail_private_h_sources = \ gtkpanedaccessible.h \ gtkprogressbaraccessible.h \ gtkradiobuttonaccessible.h \ - gtkradiomenuitemaccessible.h \ gtkradiosubmenuitemaccessible.h \ gtkrangeaccessible.h \ gtkrenderercellaccessible.h \ diff --git a/gtk/a11y/gtkradiomenuitemaccessible.c b/gtk/a11y/gtkradiomenuitemaccessible.c deleted file mode 100644 index e68d5256c..000000000 --- a/gtk/a11y/gtkradiomenuitemaccessible.c +++ /dev/null @@ -1,112 +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 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 -#include "gtkradiomenuitemaccessible.h" -#include "gtkradiosubmenuitemaccessible.h" - - -G_DEFINE_TYPE (GtkRadioMenuItemAccessible, _gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE) - -static AtkRelationSet * -gtk_radio_menu_item_accessible_ref_relation_set (AtkObject *obj) -{ - GtkWidget *widget; - AtkRelationSet *relation_set; - GSList *list; - GtkRadioMenuItemAccessible *radio_menu_item; - - widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj)); - if (widget == NULL) - return NULL; - - radio_menu_item = GTK_RADIO_MENU_ITEM_ACCESSIBLE (obj); - - relation_set = ATK_OBJECT_CLASS (_gtk_radio_menu_item_accessible_parent_class)->ref_relation_set (obj); - - /* If the radio menu_item'group has changed remove the relation */ - list = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (widget)); - if (radio_menu_item->old_group != list) - { - AtkRelation *relation; - - relation = atk_relation_set_get_relation_by_type (relation_set, ATK_RELATION_MEMBER_OF); - atk_relation_set_remove (relation_set, relation); - } - - if (!atk_relation_set_contains (relation_set, ATK_RELATION_MEMBER_OF)) - { - /* Get the members of the menu_item group */ - - radio_menu_item->old_group = list; - if (list) - { - AtkObject **accessible_array; - guint list_length; - AtkRelation* relation; - gint i = 0; - - list_length = g_slist_length (list); - accessible_array = g_new (AtkObject *, list_length); - while (list != NULL) - { - GtkWidget* list_item = list->data; - - accessible_array[i++] = gtk_widget_get_accessible (list_item); - - list = list->next; - } - relation = atk_relation_new (accessible_array, list_length, - ATK_RELATION_MEMBER_OF); - g_free (accessible_array); - - atk_relation_set_add (relation_set, relation); - - /* Unref the relation so that it is not leaked */ - g_object_unref (relation); - } - } - - return relation_set; -} - -static void -gtk_radio_menu_item_accessible_initialize (AtkObject *obj, - gpointer data) -{ - ATK_OBJECT_CLASS (_gtk_radio_menu_item_accessible_parent_class)->initialize (obj, data); - - obj->role = ATK_ROLE_RADIO_MENU_ITEM; -} - -static void -_gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *klass) -{ - AtkObjectClass *class = ATK_OBJECT_CLASS (klass); - - class->ref_relation_set = gtk_radio_menu_item_accessible_ref_relation_set; - class->initialize = gtk_radio_menu_item_accessible_initialize; -} - -static void -_gtk_radio_menu_item_accessible_init (GtkRadioMenuItemAccessible *radio_menu_item) -{ -} diff --git a/gtk/a11y/gtkradiomenuitemaccessible.h b/gtk/a11y/gtkradiomenuitemaccessible.h deleted file mode 100644 index 4c80a51b5..000000000 --- a/gtk/a11y/gtkradiomenuitemaccessible.h +++ /dev/null @@ -1,53 +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_RADIO_MENU_ITEM_ACCESSIBLE_H__ -#define __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__ - -#include "gtkcheckmenuitemaccessible.h" - -G_BEGIN_DECLS - -#define GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE (_gtk_radio_menu_item_accessible_get_type ()) -#define GTK_RADIO_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessible)) -#define GTK_RADIO_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessibleClass)) -#define GTK_IS_RADIO_MENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE)) -#define GTK_IS_RADIO_MENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE)) -#define GTK_RADIO_MENU_ITEM_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE, GtkRadioMenuItemAccessibleClass)) - -typedef struct _GtkRadioMenuItemAccessible GtkRadioMenuItemAccessible; -typedef struct _GtkRadioMenuItemAccessibleClass GtkRadioMenuItemAccessibleClass; - -struct _GtkRadioMenuItemAccessible -{ - GtkCheckMenuItemAccessible parent; - - GSList *old_group; -}; - -struct _GtkRadioMenuItemAccessibleClass -{ - GtkCheckMenuItemAccessibleClass parent_class; -}; - -GType _gtk_radio_menu_item_accessible_get_type (void); - -G_END_DECLS - -#endif /* __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__ */ diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c index e59697619..cccbffe8e 100644 --- a/gtk/gtkradiomenuitem.c +++ b/gtk/gtkradiomenuitem.c @@ -31,7 +31,6 @@ #include "gtkactivatable.h" #include "gtkprivate.h" #include "gtkintl.h" -#include "a11y/gtkradiomenuitemaccessible.h" #include "a11y/gtkradiosubmenuitemaccessible.h" /** -- 2.43.2