[gtk+] a11y: Rename radiosubmenuitem to radiomenuitem

[Benjamin Otte <otte src gnome org>]

commit fa16a54b2142cd6bf40f0007e0ba978dffcd721b
Author: Benjamin Otte <otte gnome org>
Date:   Mon Jul 18 18:58:15 2011 +0200

    a11y: Rename radiosubmenuitem to radiomenuitem

 gtk/a11y/Makefile.am                               |    4 +-
 ...emaccessible.c => gtkradiomenuitemaccessible.c} |   24 +++++-----
 gtk/a11y/gtkradiomenuitemaccessible.h              |   53 ++++++++++++++++++++
 gtk/a11y/gtkradiosubmenuitemaccessible.h           |   53 --------------------
 gtk/gtkradiomenuitem.c                             |    4 +-
 5 files changed, 69 insertions(+), 69 deletions(-)
---
diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am
index 2d97962..aa66028 100644
--- a/gtk/a11y/Makefile.am
+++ b/gtk/a11y/Makefile.am
@@ -30,7 +30,7 @@ gail_c_sources =			\
 	gtkpanedaccessible.c		\
 	gtkprogressbaraccessible.c	\
 	gtkradiobuttonaccessible.c	\
-	gtkradiosubmenuitemaccessible.c	\
+	gtkradiomenuitemaccessible.c	\
 	gtkrangeaccessible.c		\
 	gtkrenderercellaccessible.c	\
 	gtkscaleaccessible.c		\
@@ -79,7 +79,7 @@ gail_private_h_sources =		\
 	gtkpanedaccessible.h		\
 	gtkprogressbaraccessible.h	\
 	gtkradiobuttonaccessible.h	\
-	gtkradiosubmenuitemaccessible.h	\
+	gtkradiomenuitemaccessible.h	\
 	gtkrangeaccessible.h		\
 	gtkrenderercellaccessible.h	\
 	gtkscaleaccessible.h		\
diff --git a/gtk/a11y/gtkradiosubmenuitemaccessible.c b/gtk/a11y/gtkradiomenuitemaccessible.c
similarity index 74%
rename from gtk/a11y/gtkradiosubmenuitemaccessible.c
rename to gtk/a11y/gtkradiomenuitemaccessible.c
index 670a5e5..84344d7 100644
--- a/gtk/a11y/gtkradiosubmenuitemaccessible.c
+++ b/gtk/a11y/gtkradiomenuitemaccessible.c
@@ -20,27 +20,27 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include "gtkradiosubmenuitemaccessible.h"
+#include "gtkradiomenuitemaccessible.h"
 
 
-G_DEFINE_TYPE (GtkRadioSubmenuItemAccessible, _gtk_radio_submenu_item_accessible, GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE)
+G_DEFINE_TYPE (GtkRadioMenuItemAccessible, _gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE)
 
 
 static AtkRelationSet *
-gtk_radio_submenu_item_accessible_ref_relation_set (AtkObject *obj)
+gtk_radio_menu_item_accessible_ref_relation_set (AtkObject *obj)
 {
   GtkWidget *widget;
   AtkRelationSet *relation_set;
   GSList *list;
-  GtkRadioSubmenuItemAccessible *radio_menu_item;
+  GtkRadioMenuItemAccessible *radio_menu_item;
 
   widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
   if (widget == NULL)
     return NULL;
 
-  radio_menu_item = GTK_RADIO_SUBMENU_ITEM_ACCESSIBLE (obj);
+  radio_menu_item = GTK_RADIO_MENU_ITEM_ACCESSIBLE (obj);
 
-  relation_set = ATK_OBJECT_CLASS (_gtk_radio_submenu_item_accessible_parent_class)->ref_relation_set (obj);
+  relation_set = ATK_OBJECT_CLASS (_gtk_radio_menu_item_accessible_parent_class)->ref_relation_set (obj);
 
   /* If the radio menu_item's group has changed remove the relation */
   list = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (widget));
@@ -89,25 +89,25 @@ gtk_radio_submenu_item_accessible_ref_relation_set (AtkObject *obj)
 }
 
 static void
-gtk_radio_submenu_item_accessible_initialize (AtkObject *obj,
+gtk_radio_menu_item_accessible_initialize (AtkObject *obj,
                                               gpointer   data)
 {
-  ATK_OBJECT_CLASS (_gtk_radio_submenu_item_accessible_parent_class)->initialize (obj, 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_submenu_item_accessible_class_init (GtkRadioSubmenuItemAccessibleClass *klass)
+_gtk_radio_menu_item_accessible_class_init (GtkRadioMenuItemAccessibleClass *klass)
 {
   AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
 
-  class->ref_relation_set = gtk_radio_submenu_item_accessible_ref_relation_set;
-  class->initialize = gtk_radio_submenu_item_accessible_initialize;
+  class->ref_relation_set = gtk_radio_menu_item_accessible_ref_relation_set;
+  class->initialize = gtk_radio_menu_item_accessible_initialize;
 }
 
 static void
-_gtk_radio_submenu_item_accessible_init (GtkRadioSubmenuItemAccessible *radio_menu_item)
+_gtk_radio_menu_item_accessible_init (GtkRadioMenuItemAccessible *radio_menu_item)
 {
   radio_menu_item->old_group = NULL;
 }
diff --git a/gtk/a11y/gtkradiomenuitemaccessible.h b/gtk/a11y/gtkradiomenuitemaccessible.h
new file mode 100644
index 0000000..5d64bc7
--- /dev/null
+++ b/gtk/a11y/gtkradiomenuitemaccessible.h
@@ -0,0 +1,53 @@
+/* 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 "gtkchecksubmenuitemaccessible.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
+{
+  GtkCheckSubmenuItemAccessible parent;
+
+  GSList *old_group;
+};
+
+struct _GtkRadioMenuItemAccessibleClass
+{
+  GtkCheckSubmenuItemAccessibleClass 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 cccbffe..b901d1c 100644
--- a/gtk/gtkradiomenuitem.c
+++ b/gtk/gtkradiomenuitem.c
@@ -31,7 +31,7 @@
 #include "gtkactivatable.h"
 #include "gtkprivate.h"
 #include "gtkintl.h"
-#include "a11y/gtkradiosubmenuitemaccessible.h"
+#include "a11y/gtkradiomenuitemaccessible.h"
 
 /**
  * SECTION:gtkradiomenuitem
@@ -409,7 +409,7 @@ gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass)
 
   widget_class->destroy = gtk_radio_menu_item_destroy;
 
-  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RADIO_SUBMENU_ITEM_ACCESSIBLE);
+  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE);
 
   menu_item_class->activate = gtk_radio_menu_item_activate;