callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a11y: Make GtkCellAccessible a GtkAccessible

Browse Source
This commit is contained in:
Benjamin Otte
2011-12-19 06:10:16 +01:00
parent e937d0613d
commit d2a58446ea
3 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
gtk/a11y/gtkcellaccessible.c
View File

@ -42,7 +42,7 @@ static const struct {
static void atk_action_interface_init (AtkActionIface *iface); static void atk_action_interface_init (AtkActionIface *iface);
static void atk_component_interface_init (AtkComponentIface *iface); static void atk_component_interface_init (AtkComponentIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkCellAccessible, _gtk_cell_accessible, ATK_TYPE_OBJECT, G_DEFINE_TYPE_WITH_CODE (GtkCellAccessible, _gtk_cell_accessible, GTK_TYPE_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init) G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init)
G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init)) G_IMPLEMENT_INTERFACE (ATK_TYPE_COMPONENT, atk_component_interface_init))
@ -87,7 +87,7 @@ gtk_cell_accessible_get_index_in_parent (AtkObject *obj)
if (GTK_IS_CONTAINER_CELL_ACCESSIBLE (parent)) if (GTK_IS_CONTAINER_CELL_ACCESSIBLE (parent))
return g_list_index (GTK_CONTAINER_CELL_ACCESSIBLE (parent)->children, obj); return g_list_index (GTK_CONTAINER_CELL_ACCESSIBLE (parent)->children, obj);
parent = gtk_widget_get_accessible (cell->widget); parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)));
if (parent == NULL) if (parent == NULL)
return -1; return -1;
@ -106,7 +106,7 @@ gtk_cell_accessible_ref_state_set (AtkObject *accessible)
state_set = atk_state_set_new (); state_set = atk_state_set_new ();
if (cell_accessible->widget == NULL) if (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell_accessible)) == NULL)
{ {
atk_state_set_add_state (state_set, ATK_STATE_DEFUNCT); atk_state_set_add_state (state_set, ATK_STATE_DEFUNCT);
return state_set; return state_set;
@ -133,7 +133,7 @@ gtk_cell_accessible_ref_state_set (AtkObject *accessible)
} }
} }
if (gtk_widget_get_mapped (cell_accessible->widget)) if (gtk_widget_get_mapped (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell_accessible))))
atk_state_set_add_state (state_set, ATK_STATE_SHOWING); atk_state_set_add_state (state_set, ATK_STATE_SHOWING);
return state_set; return state_set;
@ -155,14 +155,6 @@ _gtk_cell_accessible_class_init (GtkCellAccessibleClass *klass)
static void static void
_gtk_cell_accessible_init (GtkCellAccessible *cell) _gtk_cell_accessible_init (GtkCellAccessible *cell)
{ {
cell->widget = NULL;
}
static void
widget_destroyed (GtkWidget *widget,
GtkCellAccessible *cell)
{
cell->widget = NULL;
} }
void void
@ -170,11 +162,8 @@ _gtk_cell_accessible_initialise (GtkCellAccessible *cell,
GtkWidget *widget, GtkWidget *widget,
AtkObject *parent) AtkObject *parent)
{ {
cell->widget = widget; gtk_accessible_set_widget (GTK_ACCESSIBLE (cell), widget);
atk_object_set_parent (ATK_OBJECT (cell), parent); atk_object_set_parent (ATK_OBJECT (cell), parent);
g_signal_connect_object (G_OBJECT (widget), "destroy",
G_CALLBACK (widget_destroyed), cell, 0);
} }
gboolean gboolean
@ -291,10 +280,10 @@ gtk_cell_accessible_action_do_action (AtkAction *action,
GtkCellAccessibleParent *parent; GtkCellAccessibleParent *parent;
cell = GTK_CELL_ACCESSIBLE (action); cell = GTK_CELL_ACCESSIBLE (action);
if (cell->widget == NULL) if (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)) == NULL)
return FALSE; return FALSE;
parent = GTK_CELL_ACCESSIBLE_PARENT (gtk_widget_get_accessible (cell->widget)); parent = GTK_CELL_ACCESSIBLE_PARENT (gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell))));
switch (index) switch (index)
{ {
@ -333,7 +322,7 @@ gtk_cell_accessible_get_extents (AtkComponent *component,
AtkObject *parent; AtkObject *parent;
cell = GTK_CELL_ACCESSIBLE (component); cell = GTK_CELL_ACCESSIBLE (component);
parent = gtk_widget_get_accessible (cell->widget); parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)));
_gtk_cell_accessible_parent_get_cell_extents (GTK_CELL_ACCESSIBLE_PARENT (parent), _gtk_cell_accessible_parent_get_cell_extents (GTK_CELL_ACCESSIBLE_PARENT (parent),
cell, cell,
@ -347,7 +336,7 @@ gtk_cell_accessible_grab_focus (AtkComponent *component)
AtkObject *parent; AtkObject *parent;
cell = GTK_CELL_ACCESSIBLE (component); cell = GTK_CELL_ACCESSIBLE (component);
parent = gtk_widget_get_accessible (cell->widget); parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)));
return _gtk_cell_accessible_parent_grab_focus (GTK_CELL_ACCESSIBLE_PARENT (parent), cell); return _gtk_cell_accessible_parent_grab_focus (GTK_CELL_ACCESSIBLE_PARENT (parent), cell);
} }
@ -374,7 +363,7 @@ _gtk_cell_accessible_get_state (GtkCellAccessible *cell)
g_return_val_if_fail (GTK_IS_CELL_ACCESSIBLE (cell), 0); g_return_val_if_fail (GTK_IS_CELL_ACCESSIBLE (cell), 0);
parent = gtk_widget_get_accessible (cell->widget); parent = gtk_widget_get_accessible (gtk_accessible_get_widget (GTK_ACCESSIBLE (cell)));
if (parent == NULL) if (parent == NULL)
return 0; return 0;

7
gtk/a11y/gtkcellaccessible.h
View File

@ -21,6 +21,7 @@
#define __GTK_CELL_ACCESSIBLE_H__ #define __GTK_CELL_ACCESSIBLE_H__
#include <atk/atk.h> #include <atk/atk.h>
#include "gtk/gtkaccessible.h"
G_BEGIN_DECLS G_BEGIN_DECLS
@ -36,14 +37,12 @@ typedef struct _GtkCellAccessibleClass GtkCellAccessibleClass;
struct _GtkCellAccessible struct _GtkCellAccessible
{ {
AtkObject parent; GtkAccessible parent;
GtkWidget *widget;
}; };
struct _GtkCellAccessibleClass struct _GtkCellAccessibleClass
{ {
AtkObjectClass parent_class; GtkAccessibleClass parent_class;
void (*update_cache) (GtkCellAccessible *cell); void (*update_cache) (GtkCellAccessible *cell);
}; };

2
gtk/a11y/gtktreeviewaccessible.c
View File

@ -120,7 +120,7 @@ cell_info_free (GtkTreeViewAccessibleCellInfo *cell_info)
{ {
g_object_steal_qdata (G_OBJECT (cell_info->cell), g_object_steal_qdata (G_OBJECT (cell_info->cell),
gtk_tree_view_accessible_get_data_quark ()); gtk_tree_view_accessible_get_data_quark ());
_gtk_cell_accessible_add_state (cell_info->cell, ATK_STATE_DEFUNCT, FALSE); gtk_accessible_set_widget (GTK_ACCESSIBLE (cell_info->cell), NULL);
} }
g_free (cell_info); g_free (cell_info);