diff --git a/gtk/a11y/Makefile.am b/gtk/a11y/Makefile.am index f060e46613..e9fa7a8fc2 100644 --- a/gtk/a11y/Makefile.am +++ b/gtk/a11y/Makefile.am @@ -10,7 +10,7 @@ gail_c_sources = \ gtkbuttonaccessible.c \ gtkcellaccessible.c \ gtkcellaccessibleparent.c \ - gtkchecksubmenuitemaccessible.c \ + gtkcheckmenuitemaccessible.c \ gtkcomboboxaccessible.c \ gtkcontaineraccessible.c \ gtkcontainercellaccessible.c \ @@ -58,7 +58,7 @@ gail_private_h_sources = \ gtkbuttonaccessible.h \ gtkcellaccessible.h \ gtkcellaccessibleparent.h \ - gtkchecksubmenuitemaccessible.h \ + gtkcheckmenuitemaccessible.h \ gtkcomboboxaccessible.h \ gtkcontaineraccessible.h \ gtkcontainercellaccessible.h \ diff --git a/gtk/a11y/gtkchecksubmenuitemaccessible.c b/gtk/a11y/gtkcheckmenuitemaccessible.c similarity index 75% rename from gtk/a11y/gtkchecksubmenuitemaccessible.c rename to gtk/a11y/gtkcheckmenuitemaccessible.c index 2d8380b532..0b111f0443 100644 --- a/gtk/a11y/gtkchecksubmenuitemaccessible.c +++ b/gtk/a11y/gtkcheckmenuitemaccessible.c @@ -21,10 +21,10 @@ #include #include -#include "gtkchecksubmenuitemaccessible.h" +#include "gtkcheckmenuitemaccessible.h" -G_DEFINE_TYPE (GtkCheckSubmenuItemAccessible, _gtk_check_submenu_item_accessible, GTK_TYPE_SUBMENU_ITEM_ACCESSIBLE) +G_DEFINE_TYPE (GtkCheckMenuItemAccessible, _gtk_check_menu_item_accessible, GTK_TYPE_SUBMENU_ITEM_ACCESSIBLE) static void toggled_cb (GtkWidget *widget) @@ -41,10 +41,10 @@ toggled_cb (GtkWidget *widget) } static void -gtk_check_submenu_item_accessible_initialize (AtkObject *obj, +gtk_check_menu_item_accessible_initialize (AtkObject *obj, gpointer data) { - ATK_OBJECT_CLASS (_gtk_check_submenu_item_accessible_parent_class)->initialize (obj, data); + ATK_OBJECT_CLASS (_gtk_check_menu_item_accessible_parent_class)->initialize (obj, data); g_signal_connect (data, "toggled", G_CALLBACK (toggled_cb), NULL); @@ -52,7 +52,7 @@ gtk_check_submenu_item_accessible_initialize (AtkObject *obj, } static AtkStateSet * -gtk_check_submenu_item_accessible_ref_state_set (AtkObject *accessible) +gtk_check_menu_item_accessible_ref_state_set (AtkObject *accessible) { AtkStateSet *state_set; GtkCheckMenuItem *check_menu_item; @@ -62,7 +62,7 @@ gtk_check_submenu_item_accessible_ref_state_set (AtkObject *accessible) if (widget == NULL) return NULL; - state_set = ATK_OBJECT_CLASS (_gtk_check_submenu_item_accessible_parent_class)->ref_state_set (accessible); + state_set = ATK_OBJECT_CLASS (_gtk_check_menu_item_accessible_parent_class)->ref_state_set (accessible); check_menu_item = GTK_CHECK_MENU_ITEM (widget); @@ -79,7 +79,7 @@ gtk_check_submenu_item_accessible_ref_state_set (AtkObject *accessible) } static void -gtk_check_submenu_item_accessible_notify_gtk (GObject *obj, +gtk_check_menu_item_accessible_notify_gtk (GObject *obj, GParamSpec *pspec) { GtkCheckMenuItem *check_menu_item = GTK_CHECK_MENU_ITEM (obj); @@ -103,22 +103,22 @@ gtk_check_submenu_item_accessible_notify_gtk (GObject *obj, atk_object_notify_state_change (atk_obj, ATK_STATE_ENABLED, (sensitive && !inconsistent)); } else - GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_check_submenu_item_accessible_parent_class)->notify_gtk (obj, pspec); + GTK_WIDGET_ACCESSIBLE_CLASS (_gtk_check_menu_item_accessible_parent_class)->notify_gtk (obj, pspec); } static void -_gtk_check_submenu_item_accessible_class_init (GtkCheckSubmenuItemAccessibleClass *klass) +_gtk_check_menu_item_accessible_class_init (GtkCheckMenuItemAccessibleClass *klass) { AtkObjectClass *class = ATK_OBJECT_CLASS (klass); GtkWidgetAccessibleClass *widget_class = (GtkWidgetAccessibleClass*)klass; - widget_class->notify_gtk = gtk_check_submenu_item_accessible_notify_gtk; + widget_class->notify_gtk = gtk_check_menu_item_accessible_notify_gtk; - class->ref_state_set = gtk_check_submenu_item_accessible_ref_state_set; - class->initialize = gtk_check_submenu_item_accessible_initialize; + class->ref_state_set = gtk_check_menu_item_accessible_ref_state_set; + class->initialize = gtk_check_menu_item_accessible_initialize; } static void -_gtk_check_submenu_item_accessible_init (GtkCheckSubmenuItemAccessible *item) +_gtk_check_menu_item_accessible_init (GtkCheckMenuItemAccessible *item) { } diff --git a/gtk/a11y/gtkcheckmenuitemaccessible.h b/gtk/a11y/gtkcheckmenuitemaccessible.h new file mode 100644 index 0000000000..bd7622ae92 --- /dev/null +++ b/gtk/a11y/gtkcheckmenuitemaccessible.h @@ -0,0 +1,51 @@ +/* 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 "gtksubmenuitemaccessible.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 +{ + GtkSubmenuItemAccessible parent; +}; + +struct _GtkCheckMenuItemAccessibleClass +{ + GtkSubmenuItemAccessibleClass 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/a11y/gtkchecksubmenuitemaccessible.h b/gtk/a11y/gtkchecksubmenuitemaccessible.h deleted file mode 100644 index 2c688d7ca4..0000000000 --- a/gtk/a11y/gtkchecksubmenuitemaccessible.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_SUBMENU_ITEM_ACCESSIBLE_H__ -#define __GTK_CHECK_SUBMENU_ITEM_ACCESSIBLE_H__ - -#include "gtksubmenuitemaccessible.h" - -G_BEGIN_DECLS - -#define GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE (_gtk_check_submenu_item_accessible_get_type ()) -#define GTK_CHECK_SUBMENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE, GtkCheckSubmenuItemAccessible)) -#define GTK_CHECK_SUBMENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE, GtkCheckSubmenuItemAccessibleClass)) -#define GTK_IS_CHECK_SUBMENU_ITEM_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE)) -#define GTK_IS_CHECK_SUBMENU_ITEM_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE)) -#define GTK_CHECK_SUBMENU_ITEM_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE, GtkCheckSubmenuItemAccessibleClass)) - -typedef struct _GtkCheckSubmenuItemAccessible GtkCheckSubmenuItemAccessible; -typedef struct _GtkCheckSubmenuItemAccessibleClass GtkCheckSubmenuItemAccessibleClass; - -struct _GtkCheckSubmenuItemAccessible -{ - GtkSubmenuItemAccessible parent; -}; - -struct _GtkCheckSubmenuItemAccessibleClass -{ - GtkSubmenuItemAccessibleClass parent_class; -}; - -GType _gtk_check_submenu_item_accessible_get_type (void); - -G_END_DECLS - -#endif /* __GTK_CHECK_SUBMENU_ITEM_ACCESSIBLE_H__ */ diff --git a/gtk/a11y/gtkradiomenuitemaccessible.c b/gtk/a11y/gtkradiomenuitemaccessible.c index 84344d7666..3c88b31b34 100644 --- a/gtk/a11y/gtkradiomenuitemaccessible.c +++ b/gtk/a11y/gtkradiomenuitemaccessible.c @@ -23,7 +23,7 @@ #include "gtkradiomenuitemaccessible.h" -G_DEFINE_TYPE (GtkRadioMenuItemAccessible, _gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE) +G_DEFINE_TYPE (GtkRadioMenuItemAccessible, _gtk_radio_menu_item_accessible, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE) static AtkRelationSet * diff --git a/gtk/a11y/gtkradiomenuitemaccessible.h b/gtk/a11y/gtkradiomenuitemaccessible.h index 5d64bc77f7..4c80a51b54 100644 --- a/gtk/a11y/gtkradiomenuitemaccessible.h +++ b/gtk/a11y/gtkradiomenuitemaccessible.h @@ -20,7 +20,7 @@ #ifndef __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__ #define __GTK_RADIO_MENU_ITEM_ACCESSIBLE_H__ -#include "gtkchecksubmenuitemaccessible.h" +#include "gtkcheckmenuitemaccessible.h" G_BEGIN_DECLS @@ -36,14 +36,14 @@ typedef struct _GtkRadioMenuItemAccessibleClass GtkRadioMenuItemAccessibleClass; struct _GtkRadioMenuItemAccessible { - GtkCheckSubmenuItemAccessible parent; + GtkCheckMenuItemAccessible parent; GSList *old_group; }; struct _GtkRadioMenuItemAccessibleClass { - GtkCheckSubmenuItemAccessibleClass parent_class; + GtkCheckMenuItemAccessibleClass parent_class; }; GType _gtk_radio_menu_item_accessible_get_type (void); diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c index e08f5fb5e3..5c6f5f0801 100644 --- a/gtk/gtkcheckmenuitem.c +++ b/gtk/gtkcheckmenuitem.c @@ -33,7 +33,7 @@ #include "gtkmarshalers.h" #include "gtkprivate.h" #include "gtkintl.h" -#include "a11y/gtkchecksubmenuitemaccessible.h" +#include "a11y/gtkcheckmenuitemaccessible.h" /** * SECTION:gtkcheckmenuitem @@ -151,7 +151,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass) widget_class->draw = gtk_check_menu_item_draw; - gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_CHECK_SUBMENU_ITEM_ACCESSIBLE); + gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE); menu_item_class->activate = gtk_check_menu_item_activate; menu_item_class->hide_on_activate = FALSE;