Commit 89e57c69 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Convert GailContainer to GtkContainerAccessible

parent 64eec8a9
......@@ -13,7 +13,7 @@ gail_c_sources = \
gtkcheckmenuitemaccessible.c \
gtkchecksubmenuitemaccessible.c \
gtkcomboboxaccessible.c \
gailcontainer.c \
gtkcontaineraccessible.c \
gailcontainercell.c \
gtkentryaccessible.c \
gtkexpanderaccessible.c \
......@@ -64,8 +64,8 @@ gail_private_h_sources = \
gtkcheckmenuitemaccessible.h \
gtkchecksubmenuitemaccessible.h \
gtkcomboboxaccessible.h \
gtkcontaineraccessible.h \
gailcontainercell.h \
gailcontainer.h \
gtkentryaccessible.h \
gtkexpanderaccessible.h \
gailfactory.h \
......
......@@ -25,7 +25,6 @@
#include <gtk/gtkx.h>
#include "gailbooleancell.h"
#include "gailcell.h"
#include "gailcontainer.h"
#include "gailcontainercell.h"
#include "gailimagecell.h"
#include "gailrenderercell.h"
......@@ -79,7 +78,6 @@ static guint focus_tracker_id = 0;
static GQuark quark_focus_object = 0;
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_WIDGET, GailWidget, gail_widget, GTK_TYPE_WIDGET)
GAIL_IMPLEMENT_FACTORY (GAIL_TYPE_CONTAINER, GailContainer, gail_container, GTK_TYPE_CONTAINER)
GAIL_IMPLEMENT_FACTORY_WITH_FUNC_DUMMY (GAIL_TYPE_RENDERER_CELL, GailRendererCell, gail_renderer_cell, GTK_TYPE_CELL_RENDERER, gail_renderer_cell_new)
GAIL_IMPLEMENT_FACTORY_WITH_FUNC_DUMMY (GAIL_TYPE_BOOLEAN_CELL, GailBooleanCell, gail_boolean_cell, GTK_TYPE_CELL_RENDERER_TOGGLE, gail_boolean_cell_new)
GAIL_IMPLEMENT_FACTORY_WITH_FUNC_DUMMY (GAIL_TYPE_IMAGE_CELL, GailImageCell, gail_image_cell, GTK_TYPE_CELL_RENDERER_PIXBUF, gail_image_cell_new)
......@@ -825,7 +823,6 @@ gail_accessibility_module_init (void)
fprintf (stderr, "GTK Accessibility Module initialized\n");
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_WIDGET, gail_widget);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CONTAINER, gail_container);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CELL_RENDERER_TEXT, gail_text_cell);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CELL_RENDERER_TOGGLE, gail_boolean_cell);
GAIL_WIDGET_SET_FACTORY (GTK_TYPE_CELL_RENDERER_PIXBUF, gail_image_cell);
......
......@@ -22,7 +22,8 @@
#include <gtk/gtk.h>
#include "gtkboxaccessible.h"
G_DEFINE_TYPE (GtkBoxAccessible, gtk_box_accessible, GAIL_TYPE_CONTAINER)
G_DEFINE_TYPE (GtkBoxAccessible, gtk_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE)
static void
gtk_box_accessible_initialize (AtkObject *accessible,
......
......@@ -20,28 +20,28 @@
#ifndef __GTK_BOX_ACCESSIBLE_H__
#define __GTK_BOX_ACCESSIBLE_H__
#include "gailcontainer.h"
#include "gtkcontaineraccessible.h"
G_BEGIN_DECLS
#define GTK_TYPE_BOX_ACCESSIBLE (gtk_box_accessible_get_type ())
#define GTK_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BOX_ACCESSIBLE, GtkBoxAccessible))
#define GTK_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BOX_ACCESSIBLE, GtkBoxAccessibleClass))
#define GTK_IS_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BOX_ACCESSIBLE))
#define GTK_IS_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BOX_ACCESSIBLE))
#define GTK_BOX_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BOX_ACCESSIBLE, GtkBoxAccessibleClass))
#define GTK_TYPE_BOX_ACCESSIBLE (gtk_box_accessible_get_type ())
#define GTK_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_BOX_ACCESSIBLE, GtkBoxAccessible))
#define GTK_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_BOX_ACCESSIBLE, GtkBoxAccessibleClass))
#define GTK_IS_BOX_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_BOX_ACCESSIBLE))
#define GTK_IS_BOX_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_BOX_ACCESSIBLE))
#define GTK_BOX_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_BOX_ACCESSIBLE, GtkBoxAccessibleClass))
typedef struct _GtkBoxAccessible GtkBoxAccessible;
typedef struct _GtkBoxAccessibleClass GtkBoxAccessibleClass;
struct _GtkBoxAccessible
{
GailContainer parent;
GtkContainerAccessible parent;
};
struct _GtkBoxAccessibleClass
{
GailContainerClass parent_class;
GtkContainerAccessibleClass parent_class;
};
GType gtk_box_accessible_get_type (void);
......
......@@ -28,7 +28,7 @@
static void atk_action_interface_init (AtkActionIface *iface);
static void atk_image_interface_init (AtkImageIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkButtonAccessible, gtk_button_accessible, GAIL_TYPE_CONTAINER,
G_DEFINE_TYPE_WITH_CODE (GtkButtonAccessible, gtk_button_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_IMAGE, atk_image_interface_init))
......@@ -226,7 +226,7 @@ static void
gtk_button_accessible_class_init (GtkButtonAccessibleClass *klass)
{
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
GailContainerClass *container_class = (GailContainerClass*)klass;
GtkContainerAccessibleClass *container_class = (GtkContainerAccessibleClass*)klass;
GailWidgetClass *widget_class = (GailWidgetClass*)klass;
class->get_name = gtk_button_accessible_get_name;
......
......@@ -20,8 +20,7 @@
#ifndef __GTK_BUTTON_ACCESSIBLE_H__
#define __GTK_BUTTON_ACCESSIBLE_H__
#include "gailcontainer.h"
#include "gailtextutil.h"
#include "gtkcontaineraccessible.h"
G_BEGIN_DECLS
......@@ -37,12 +36,12 @@ typedef struct _GtkButtonAccessibleClass GtkButtonAccessibleClass;
struct _GtkButtonAccessible
{
GailContainer parent;
GtkContainerAccessible parent;
};
struct _GtkButtonAccessibleClass
{
GailContainerClass parent_class;
GtkContainerAccessibleClass parent_class;
};
GType gtk_button_accessible_get_type (void);
......
......@@ -26,7 +26,7 @@
static void atk_action_interface_init (AtkActionIface *iface);
static void atk_selection_interface_init (AtkSelectionIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkComboBoxAccessible, gtk_combo_box_accessible, GAIL_TYPE_CONTAINER,
G_DEFINE_TYPE_WITH_CODE (GtkComboBoxAccessible, gtk_combo_box_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_SELECTION, atk_selection_interface_init))
......
......@@ -20,7 +20,7 @@
#ifndef __GTK_COMBO_BOX_ACCESSIBLE_H__
#define __GTK_COMBO_BOX_ACCESSIBLE_H__
#include "gailcontainer.h"
#include "gtkcontaineraccessible.h"
G_BEGIN_DECLS
......@@ -36,7 +36,7 @@ typedef struct _GtkComboBoxAccessibleClass GtkComboBoxAccessibleClass;
struct _GtkComboBoxAccessible
{
GailContainer parent;
GtkContainerAccessible parent;
gchar *name;
gint old_selection;
......@@ -45,7 +45,7 @@ struct _GtkComboBoxAccessible
struct _GtkComboBoxAccessibleClass
{
GailContainerClass parent_class;
GtkContainerAccessibleClass parent_class;
};
GType gtk_combo_box_accessible_get_type (void);
......
......@@ -20,65 +20,23 @@
#include "config.h"
#include <gtk/gtk.h>
#include "gailcontainer.h"
static void gail_container_class_init (GailContainerClass *klass);
static void gail_container_init (GailContainer *container);
static gint gail_container_get_n_children (AtkObject *obj);
static AtkObject* gail_container_ref_child (AtkObject *obj,
gint i);
static gint gail_container_add_gtk (GtkContainer *container,
GtkWidget *widget,
gpointer data);
static gint gail_container_remove_gtk (GtkContainer *container,
GtkWidget *widget,
gpointer data);
static gint gail_container_real_add_gtk (GtkContainer *container,
GtkWidget *widget,
gpointer data);
static gint gail_container_real_remove_gtk (GtkContainer *container,
GtkWidget *widget,
gpointer data);
static void gail_container_real_initialize (AtkObject *obj,
gpointer data);
static void gail_container_finalize (GObject *object);
G_DEFINE_TYPE (GailContainer, gail_container, GAIL_TYPE_WIDGET)
#include "gtkcontaineraccessible.h"
static void
gail_container_class_init (GailContainerClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
gobject_class->finalize = gail_container_finalize;
class->get_n_children = gail_container_get_n_children;
class->ref_child = gail_container_ref_child;
class->initialize = gail_container_real_initialize;
klass->add_gtk = gail_container_real_add_gtk;
klass->remove_gtk = gail_container_real_remove_gtk;
}
G_DEFINE_TYPE (GtkContainerAccessible, gtk_container_accessible, GAIL_TYPE_WIDGET)
static void
gail_container_init (GailContainer *container)
gtk_container_accessible_init (GtkContainerAccessible *container)
{
container->children = NULL;
}
static gint
gail_container_get_n_children (AtkObject* obj)
gtk_container_accessible_get_n_children (AtkObject* obj)
{
GtkWidget *widget;
GList *children;
gint count = 0;
g_return_val_if_fail (GAIL_IS_CONTAINER (obj), count);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
if (widget == NULL)
return 0;
......@@ -87,20 +45,17 @@ gail_container_get_n_children (AtkObject* obj)
count = g_list_length (children);
g_list_free (children);
return count;
return count;
}
static AtkObject*
gail_container_ref_child (AtkObject *obj,
gint i)
static AtkObject *
gtk_container_accessible_ref_child (AtkObject *obj,
gint i)
{
GList *children, *tmp_list;
AtkObject *accessible;
GtkWidget *widget;
g_return_val_if_fail (GAIL_IS_CONTAINER (obj), NULL);
g_return_val_if_fail ((i >= 0), NULL);
widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (obj));
if (widget == NULL)
return NULL;
......@@ -111,23 +66,24 @@ gail_container_ref_child (AtkObject *obj,
{
g_list_free (children);
return NULL;
}
}
accessible = gtk_widget_get_accessible (GTK_WIDGET (tmp_list->data));
g_list_free (children);
g_object_ref (accessible);
return accessible;
return accessible;
}
static gint
gail_container_add_gtk (GtkContainer *container,
GtkWidget *widget,
gpointer data)
gtk_container_accessible_add_gtk (GtkContainer *container,
GtkWidget *widget,
gpointer data)
{
GailContainer *gail_container = GAIL_CONTAINER (data);
GailContainerClass *klass;
GtkContainerAccessible *accessible = GTK_CONTAINER_ACCESSIBLE (data);
GtkContainerAccessibleClass *klass;
klass = GAIL_CONTAINER_GET_CLASS (gail_container);
klass = GTK_CONTAINER_ACCESSIBLE_GET_CLASS (accessible);
if (klass->add_gtk)
return klass->add_gtk (container, widget, data);
......@@ -136,95 +92,80 @@ gail_container_add_gtk (GtkContainer *container,
}
static gint
gail_container_remove_gtk (GtkContainer *container,
gtk_container_accessible_remove_gtk (GtkContainer *container,
GtkWidget *widget,
gpointer data)
{
GailContainer *gail_container = GAIL_CONTAINER (data);
GailContainerClass *klass;
GtkContainerAccessible *accessible = GTK_CONTAINER_ACCESSIBLE (data);
GtkContainerAccessibleClass *klass;
klass = GAIL_CONTAINER_GET_CLASS (gail_container);
klass = GTK_CONTAINER_ACCESSIBLE_GET_CLASS (accessible);
if (klass->remove_gtk)
return klass->remove_gtk (container, widget, data);
else
return 1;
}
static gint
gail_container_real_add_gtk (GtkContainer *container,
GtkWidget *widget,
gpointer data)
gtk_container_accessible_real_add_gtk (GtkContainer *container,
GtkWidget *widget,
gpointer data)
{
AtkObject* atk_parent = ATK_OBJECT (data);
AtkObject* atk_child = gtk_widget_get_accessible (widget);
GailContainer *gail_container = GAIL_CONTAINER (atk_parent);
gint index;
AtkObject *atk_parent;
AtkObject *atk_child;
GtkContainerAccessible *accessible;
gint index;
g_object_notify (G_OBJECT (atk_child), "accessible_parent");
atk_parent = ATK_OBJECT (data);
atk_child = gtk_widget_get_accessible (widget);
accessible = GTK_CONTAINER_ACCESSIBLE (atk_parent);
g_list_free (gail_container->children);
gail_container->children = gtk_container_get_children (container);
index = g_list_index (gail_container->children, widget);
g_signal_emit_by_name (atk_parent, "children_changed::add",
index, atk_child, NULL);
g_object_notify (G_OBJECT (atk_child), "accessible_parent");
g_list_free (accessible->children);
accessible->children = gtk_container_get_children (container);
index = g_list_index (accessible->children, widget);
g_signal_emit_by_name (atk_parent, "children_changed::add", index, atk_child, NULL);
return 1;
}
static gint
gail_container_real_remove_gtk (GtkContainer *container,
GtkWidget *widget,
gpointer data)
gtk_container_accessible_real_remove_gtk (GtkContainer *container,
GtkWidget *widget,
gpointer data)
{
AtkPropertyValues values = { NULL };
AtkObject* atk_parent;
AtkObject *atk_child;
GailContainer *gail_container;
gint index;
GtkContainerAccessible *accessible;
gint index;
atk_parent = ATK_OBJECT (data);
atk_child = gtk_widget_get_accessible (widget);
accessible = GTK_CONTAINER_ACCESSIBLE (atk_parent);
if (atk_child)
{
g_value_init (&values.old_value, G_TYPE_POINTER);
g_value_set_pointer (&values.old_value, atk_parent);
values.property_name = "accessible-parent";
g_object_ref (atk_child);
g_signal_emit_by_name (atk_child,
"property_change::accessible-parent", &values, NULL);
g_object_unref (atk_child);
}
gail_container = GAIL_CONTAINER (atk_parent);
index = g_list_index (gail_container->children, widget);
g_list_free (gail_container->children);
gail_container->children = gtk_container_get_children (container);
if (index >= 0 && index <= g_list_length (gail_container->children))
g_signal_emit_by_name (atk_parent, "children_changed::remove",
index, atk_child, NULL);
g_object_notify (G_OBJECT (atk_child), "accessible_parent");
index = g_list_index (accessible->children, widget);
g_list_free (accessible->children);
accessible->children = gtk_container_get_children (container);
if (index >= 0 && index <= g_list_length (accessible->children))
g_signal_emit_by_name (atk_parent, "children_changed::remove", index, atk_child, NULL);
return 1;
}
static void
gail_container_real_initialize (AtkObject *obj,
gpointer data)
gtk_container_accessible_real_initialize (AtkObject *obj,
gpointer data)
{
GailContainer *container = GAIL_CONTAINER (obj);
GtkContainerAccessible *accessible = GTK_CONTAINER_ACCESSIBLE (obj);
ATK_OBJECT_CLASS (gail_container_parent_class)->initialize (obj, data);
ATK_OBJECT_CLASS (gtk_container_accessible_parent_class)->initialize (obj, data);
container->children = gtk_container_get_children (GTK_CONTAINER (data));
accessible->children = gtk_container_get_children (GTK_CONTAINER (data));
g_signal_connect (data, "add",
G_CALLBACK (gail_container_add_gtk),
obj);
g_signal_connect (data, "remove",
G_CALLBACK (gail_container_remove_gtk),
obj);
g_signal_connect (data, "add", G_CALLBACK (gtk_container_accessible_add_gtk), obj);
g_signal_connect (data, "remove", G_CALLBACK (gtk_container_accessible_remove_gtk), obj);
if (GTK_IS_TOOLBAR (data))
obj->role = ATK_ROLE_TOOL_BAR;
......@@ -235,10 +176,27 @@ gail_container_real_initialize (AtkObject *obj,
}
static void
gail_container_finalize (GObject *object)
gtk_container_accessible_finalize (GObject *object)
{
GailContainer *container = GAIL_CONTAINER (object);
GtkContainerAccessible *accessible = GTK_CONTAINER_ACCESSIBLE (object);
g_list_free (accessible->children);
G_OBJECT_CLASS (gtk_container_accessible_parent_class)->finalize (object);
}
static void
gtk_container_accessible_class_init (GtkContainerAccessibleClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
AtkObjectClass *class = ATK_OBJECT_CLASS (klass);
gobject_class->finalize = gtk_container_accessible_finalize;
class->get_n_children = gtk_container_accessible_get_n_children;
class->ref_child = gtk_container_accessible_ref_child;
class->initialize = gtk_container_accessible_real_initialize;
g_list_free (container->children);
G_OBJECT_CLASS (gail_container_parent_class)->finalize (object);
klass->add_gtk = gtk_container_accessible_real_add_gtk;
klass->remove_gtk = gtk_container_accessible_real_remove_gtk;
}
......@@ -17,44 +17,44 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef __GAIL_CONTAINER_H__
#define __GAIL_CONTAINER_H__
#ifndef __GTK_CONTAINER_ACCESSIBLE_H__
#define __GTK_CONTAINER_ACCESSIBLE_H__
#include "gailwidget.h"
G_BEGIN_DECLS
#define GAIL_TYPE_CONTAINER (gail_container_get_type ())
#define GAIL_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GAIL_TYPE_CONTAINER, GailContainer))
#define GAIL_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GAIL_TYPE_CONTAINER, GailContainerClass))
#define GAIL_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GAIL_TYPE_CONTAINER))
#define GAIL_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GAIL_TYPE_CONTAINER))
#define GAIL_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GAIL_TYPE_CONTAINER, GailContainerClass))
#define GTK_TYPE_CONTAINER_ACCESSIBLE (gtk_container_accessible_get_type ())
#define GTK_CONTAINER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CONTAINER_ACCESSIBLE, GtkContainerAccessible))
#define GTK_CONTAINER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CONTAINER_ACCESSIBLE, GtkContainerAccessibleClass))
#define GTK_IS_CONTAINER_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CONTAINER_ACCESSIBLE))
#define GTK_IS_CONTAINER_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CONTAINER_ACCESSIBLE))
#define GTK_CONTAINER_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CONTAINER_ACCESSIBLE, GtkContainerAccessibleClass))
typedef struct _GailContainer GailContainer;
typedef struct _GailContainerClass GailContainerClass;
typedef struct _GtkContainerAccessible GtkContainerAccessible;
typedef struct _GtkContainerAccessibleClass GtkContainerAccessibleClass;
struct _GailContainer
struct _GtkContainerAccessible
{
GailWidget parent;
GList *children;
};
GType gail_container_get_type (void);
struct _GailContainerClass
struct _GtkContainerAccessibleClass
{
GailWidgetClass parent_class;
gint (*add_gtk) (GtkContainer *container,
GtkWidget *widget,
gpointer data);
gint (*add_gtk) (GtkContainer *container,
GtkWidget *widget,
gpointer data);
gint (*remove_gtk) (GtkContainer *container,
GtkWidget *widget,
gpointer data);
};
GType gtk_container_accessible_get_type (void);
G_END_DECLS
#endif /* __GAIL_CONTAINER_H__ */
#endif /* __GTK_CONTAINER_ACCESSIBLE_H__ */
......@@ -25,7 +25,7 @@
static void atk_action_interface_init (AtkActionIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkExpanderAccessible, gtk_expander_accessible, GAIL_TYPE_CONTAINER,
G_DEFINE_TYPE_WITH_CODE (GtkExpanderAccessible, gtk_expander_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init))
static const gchar *
......
......@@ -20,7 +20,7 @@
#ifndef __GTK_EXPANDER_ACCESSIBLE_H__
#define __GTK_EXPANDER_ACCESSIBLE_H__
#include "gailcontainer.h"
#include "gtkcontaineraccessible.h"
G_BEGIN_DECLS
......@@ -36,12 +36,12 @@ typedef struct _GtkExpanderAccessibleClass GtkExpanderAccessibleClass;
struct _GtkExpanderAccessible
{
GailContainer parent;
GtkContainerAccessible parent;
};
struct _GtkExpanderAccessibleClass
{
GailContainerClass parent_class;
GtkContainerAccessibleClass parent_class;
};
GType gtk_expander_accessible_get_type (void);
......
......@@ -24,7 +24,7 @@
#include "gtkframeaccessible.h"
G_DEFINE_TYPE (GtkFrameAccessible, gtk_frame_accessible, GAIL_TYPE_CONTAINER)
G_DEFINE_TYPE (GtkFrameAccessible, gtk_frame_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE)
static void
gtk_frame_accessible_initialize (AtkObject *accessible,
......
......@@ -20,7 +20,7 @@
#ifndef __GTK_FRAME_ACCESSIBLE_H__
#define __GTK_FRAME_ACCESSIBLE_H__
#include "gailcontainer.h"
#include "gtkcontaineraccessible.h"
G_BEGIN_DECLS
......@@ -36,12 +36,12 @@ typedef struct _GtkFrameAccessibleClass GtkFrameAccessibleClass;
struct _GtkFrameAccessible
{
GailContainer parent;
GtkContainerAccessible parent;
};
struct _GtkFrameAccessibleClass
{
GailContainerClass parent_class;
GtkContainerAccessibleClass parent_class;
};
GType gtk_frame_accessible_get_type (void);
......
......@@ -33,7 +33,7 @@ static gchar *get_text_from_label_widget (GtkWidget *widget);
static void atk_action_interface_init (AtkActionIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkMenuItemAccessible, gtk_menu_item_accessible, GAIL_TYPE_CONTAINER,
G_DEFINE_TYPE_WITH_CODE (GtkMenuItemAccessible, gtk_menu_item_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init))