summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/elementary/efl_access_object.c16
-rw-r--r--src/lib/elementary/efl_access_object.eo2
-rw-r--r--src/lib/elementary/efl_access_object.h26
-rw-r--r--src/lib/elementary/efl_access_window.h14
-rw-r--r--src/lib/elementary/efl_ui_widget.c13
-rw-r--r--src/lib/elementary/efl_ui_win.c6
-rw-r--r--src/lib/elementary/elm_atspi_app_object.c2
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c82
-rw-r--r--src/lib/elementary/elm_entry.c12
-rw-r--r--src/lib/elementary/elm_menu.c4
10 files changed, 91 insertions, 86 deletions
diff --git a/src/lib/elementary/efl_access_object.c b/src/lib/elementary/efl_access_object.c
index b962627..cbc9673 100644
--- a/src/lib/elementary/efl_access_object.c
+++ b/src/lib/elementary/efl_access_object.c
@@ -146,7 +146,7 @@ _efl_access_object_index_in_parent_get(const Eo *obj, Efl_Access_Object_Data *pd
146 Eo *chld, *parent = NULL; 146 Eo *chld, *parent = NULL;
147 int ret = 0; 147 int ret = 0;
148 148
149 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 149 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
150 if (!parent) return -1; 150 if (!parent) return -1;
151 151
152 children = efl_access_object_access_children_get(parent); 152 children = efl_access_object_access_children_get(parent);
@@ -173,14 +173,14 @@ _efl_access_object_efl_object_provider_find(const Eo *obj, Efl_Access_Object_Dat
173{ 173{
174 if (efl_isa(obj, klass)) 174 if (efl_isa(obj, klass))
175 { 175 {
176 if (klass == EFL_ACCESS_OBJECT_MIXIN) 176 if (klass == EFL_ACCESS_OBJECT_CLASS)
177 { 177 {
178 Efl_Access_Type type = efl_access_object_access_type_get(obj); 178 Efl_Access_Type type = efl_access_object_access_type_get(obj);
179 if (type != EFL_ACCESS_TYPE_SKIPPED) return (Eo*)obj; 179 if (type != EFL_ACCESS_TYPE_SKIPPED) return (Eo*)obj;
180 } 180 }
181 else return (Eo*)obj; 181 else return (Eo*)obj;
182 } 182 }
183 return efl_provider_find(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN), klass); 183 return efl_provider_find(efl_super(obj, EFL_ACCESS_OBJECT_CLASS), klass);
184} 184}
185 185
186EOLIAN Eina_List* 186EOLIAN Eina_List*
@@ -363,7 +363,7 @@ _efl_access_object_access_children_get(const Eo *obj, Efl_Access_Object_Data *pd
363 363
364 EINA_ITERATOR_FOREACH(iter, chld) 364 EINA_ITERATOR_FOREACH(iter, chld)
365 { 365 {
366 if (efl_isa(chld, EFL_ACCESS_OBJECT_MIXIN)) 366 if (efl_isa(chld, EFL_ACCESS_OBJECT_CLASS))
367 children = eina_list_append(children, chld); 367 children = eina_list_append(children, chld);
368 } 368 }
369 eina_iterator_free(iter); 369 eina_iterator_free(iter);
@@ -401,7 +401,7 @@ _efl_access_object_event_emit(Eo *class EINA_UNUSED, void *pd EINA_UNUSED, Eo *a
401 Efl_Access_Event_Handler *hdl; 401 Efl_Access_Event_Handler *hdl;
402 Efl_Access_Type type; 402 Efl_Access_Type type;
403 403
404 if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_OBJECT_MIXIN)) 404 if (!accessible || !event || !efl_isa(accessible, EFL_ACCESS_OBJECT_CLASS))
405 { 405 {
406 CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL"); 406 CRI("Invalid parameters, event: %s, obj: %s", event ? event->name : "NULL", accessible ? efl_class_name_get(accessible) : "NULL");
407 return; 407 return;
@@ -610,7 +610,7 @@ _efl_access_object_access_type_set(Eo *obj, Efl_Access_Object_Data *pd, Efl_Acce
610 if (val == pd->type) 610 if (val == pd->type)
611 return; 611 return;
612 612
613 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 613 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
614 614
615 switch (val) 615 switch (val)
616 { 616 {
@@ -631,7 +631,7 @@ _efl_access_object_efl_object_invalidate(Eo *obj, Efl_Access_Object_Data *pd)
631{ 631{
632 efl_access_relation_set_free(pd); 632 efl_access_relation_set_free(pd);
633 633
634 efl_invalidate(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN)); 634 efl_invalidate(efl_super(obj, EFL_ACCESS_OBJECT_CLASS));
635} 635}
636 636
637EOLIAN void 637EOLIAN void
@@ -641,7 +641,7 @@ _efl_access_object_efl_object_destructor(Eo *obj, Efl_Access_Object_Data *pd)
641 eina_stringshare_del(pd->description); 641 eina_stringshare_del(pd->description);
642 eina_stringshare_del(pd->translation_domain); 642 eina_stringshare_del(pd->translation_domain);
643 643
644 efl_destructor(efl_super(obj, EFL_ACCESS_OBJECT_MIXIN)); 644 efl_destructor(efl_super(obj, EFL_ACCESS_OBJECT_CLASS));
645} 645}
646 646
647void 647void
diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo
index ad82be2..a75ce3c 100644
--- a/src/lib/elementary/efl_access_object.eo
+++ b/src/lib/elementary/efl_access_object.eo
@@ -239,7 +239,7 @@ struct Efl.Access.Relation
239 objects: list<Efl.Object>; [[List with relation objects]] 239 objects: list<Efl.Object>; [[List with relation objects]]
240} 240}
241 241
242mixin Efl.Access.Object (Efl.Interface, Efl.Object) 242class Efl.Access.Object (Efl.Object)
243{ 243{
244 [[Accessibility accessible mixin]] 244 [[Accessibility accessible mixin]]
245 eo_prefix: efl_access_object; 245 eo_prefix: efl_access_object;
diff --git a/src/lib/elementary/efl_access_object.h b/src/lib/elementary/efl_access_object.h
index 72fb577..3930e3b 100644
--- a/src/lib/elementary/efl_access_object.h
+++ b/src/lib/elementary/efl_access_object.h
@@ -40,7 +40,7 @@ EAPI void efl_access_attributes_list_free(Eina_List *list);
40 Efl_Access_Event_State_Changed_Data evinfo; \ 40 Efl_Access_Event_State_Changed_Data evinfo; \
41 evinfo.type = (tp); \ 41 evinfo.type = (tp); \
42 evinfo.new_value = (nvl); \ 42 evinfo.new_value = (nvl); \
43 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \ 43 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_STATE_CHANGED, (void*)&evinfo); \
44 } while(0); } 44 } while(0); }
45 45
46/** 46/**
@@ -49,38 +49,38 @@ EAPI void efl_access_attributes_list_free(Eina_List *list);
49#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \ 49#define efl_access_bounds_changed_signal_emit(obj, x, y, width, height) \
50 do { \ 50 do { \
51 Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \ 51 Efl_Access_Event_Geometry_Changed_Data evinfo = { x, y, width, height }; \
52 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \ 52 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_BOUNDS_CHANGED, (void*)&evinfo); \
53 } while(0); 53 } while(0);
54 54
55/** 55/**
56 * Emits Accessible 'PropertyChanged' signal for 'Name' property. 56 * Emits Accessible 'PropertyChanged' signal for 'Name' property.
57 */ 57 */
58#define efl_access_i18n_name_changed_signal_emit(obj) \ 58#define efl_access_i18n_name_changed_signal_emit(obj) \
59 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name"); 59 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "i18n_name");
60 60
61/** 61/**
62 * Emits Accessible 'PropertyChanged' signal for 'Description' property. 62 * Emits Accessible 'PropertyChanged' signal for 'Description' property.
63 */ 63 */
64#define efl_access_description_changed_signal_emit(obj) \ 64#define efl_access_description_changed_signal_emit(obj) \
65 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description"); 65 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "description");
66 66
67/** 67/**
68 * Emits Accessible 'PropertyChanged' signal for 'Parent' property. 68 * Emits Accessible 'PropertyChanged' signal for 'Parent' property.
69 */ 69 */
70#define efl_access_parent_changed_signal_emit(obj) \ 70#define efl_access_parent_changed_signal_emit(obj) \
71 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent"); 71 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "parent");
72 72
73/** 73/**
74 * Emits Accessible 'PropertyChanged' signal for 'Role' property. 74 * Emits Accessible 'PropertyChanged' signal for 'Role' property.
75 */ 75 */
76#define efl_access_role_changed_signal_emit(obj) \ 76#define efl_access_role_changed_signal_emit(obj) \
77 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role"); 77 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "role");
78 78
79/** 79/**
80 * Emits Accessible 'PropertyChanged' signal for 'Value' property. 80 * Emits Accessible 'PropertyChanged' signal for 'Value' property.
81 */ 81 */
82#define efl_access_value_changed_signal_emit(obj) \ 82#define efl_access_value_changed_signal_emit(obj) \
83 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value"); 83 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_PROPERTY_CHANGED, "value");
84 84
85/** 85/**
86 * Emits Accessible 'ChildrenChanged' signal with added child as argument. 86 * Emits Accessible 'ChildrenChanged' signal with added child as argument.
@@ -88,7 +88,7 @@ EAPI void efl_access_attributes_list_free(Eina_List *list);
88#define efl_access_children_changed_added_signal_emit(obj, child) \ 88#define efl_access_children_changed_added_signal_emit(obj, child) \
89 do { \ 89 do { \
90 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \ 90 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_TRUE, child }; \
91 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \ 91 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
92 } while(0); 92 } while(0);
93 93
94/** 94/**
@@ -97,32 +97,32 @@ EAPI void efl_access_attributes_list_free(Eina_List *list);
97#define efl_access_children_changed_del_signal_emit(obj, child) \ 97#define efl_access_children_changed_del_signal_emit(obj, child) \
98 do { \ 98 do { \
99 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \ 99 Efl_Access_Event_Children_Changed_Data atspi_data = { EINA_FALSE, child }; \
100 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \ 100 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_CHILDREN_CHANGED, &atspi_data); \
101 } while(0); 101 } while(0);
102 102
103/** 103/**
104 * Emits Accessible 'ActiveDescendantChanged' signal. 104 * Emits Accessible 'ActiveDescendantChanged' signal.
105 */ 105 */
106#define efl_access_active_descendant_changed_signal_emit(obj, child) \ 106#define efl_access_active_descendant_changed_signal_emit(obj, child) \
107 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child); 107 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_ACTIVE_DESCENDANT_CHANGED, child);
108 108
109/** 109/**
110 * Emits Accessible 'VisibleDataChanged' signal. 110 * Emits Accessible 'VisibleDataChanged' signal.
111 */ 111 */
112#define efl_access_visible_data_changed_signal_emit(obj) \ 112#define efl_access_visible_data_changed_signal_emit(obj) \
113 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL); 113 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_VISIBLE_DATA_CHANGED, NULL);
114 114
115/** 115/**
116 * Emits Accessible 'AddAccessible' signal. 116 * Emits Accessible 'AddAccessible' signal.
117 */ 117 */
118#define efl_access_added(obj) \ 118#define efl_access_added(obj) \
119 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL); 119 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_ADDED, NULL);
120 120
121/** 121/**
122 * Emits Accessible 'RemoveAccessible' signal. 122 * Emits Accessible 'RemoveAccessible' signal.
123 */ 123 */
124#define efl_access_removed(obj) \ 124#define efl_access_removed(obj) \
125 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL); 125 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_OBJECT_EVENT_REMOVED, NULL);
126 126
127#endif 127#endif
128 128
diff --git a/src/lib/elementary/efl_access_window.h b/src/lib/elementary/efl_access_window.h
index 38938d2..342fd11 100644
--- a/src/lib/elementary/efl_access_window.h
+++ b/src/lib/elementary/efl_access_window.h
@@ -14,43 +14,43 @@
14 * Emits 'Window:Activated' accessible signal. 14 * Emits 'Window:Activated' accessible signal.
15 */ 15 */
16#define efl_access_window_activated_signal_emit(obj) \ 16#define efl_access_window_activated_signal_emit(obj) \
17 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL); 17 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_ACTIVATED, NULL);
18 18
19/** 19/**
20 * Emits 'Window:Deactivated' accessible signal. 20 * Emits 'Window:Deactivated' accessible signal.
21 */ 21 */
22#define efl_access_window_deactivated_signal_emit(obj) \ 22#define efl_access_window_deactivated_signal_emit(obj) \
23 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL); 23 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DEACTIVATED, NULL);
24 24
25/** 25/**
26 * Emits 'Window:Created' accessible signal. 26 * Emits 'Window:Created' accessible signal.
27 */ 27 */
28#define efl_access_window_created_signal_emit(obj) \ 28#define efl_access_window_created_signal_emit(obj) \
29 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL); 29 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_CREATED, NULL);
30 30
31/** 31/**
32 * Emits 'Window:Destroyed' accessible signal. 32 * Emits 'Window:Destroyed' accessible signal.
33 */ 33 */
34#define efl_access_window_destroyed_signal_emit(obj) \ 34#define efl_access_window_destroyed_signal_emit(obj) \
35 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL); 35 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_DESTROYED, NULL);
36 36
37/** 37/**
38 * Emits 'Window:Maximized' accessible signal. 38 * Emits 'Window:Maximized' accessible signal.
39 */ 39 */
40#define efl_access_window_maximized_signal_emit(obj) \ 40#define efl_access_window_maximized_signal_emit(obj) \
41 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL); 41 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MAXIMIZED, NULL);
42 42
43/** 43/**
44 * Emits 'Window:Minimized' accessible signal. 44 * Emits 'Window:Minimized' accessible signal.
45 */ 45 */
46#define efl_access_window_minimized_signal_emit(obj) \ 46#define efl_access_window_minimized_signal_emit(obj) \
47 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL); 47 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_MINIMIZED, NULL);
48 48
49/** 49/**
50 * Emits 'Window:Restored' accessible signal. 50 * Emits 'Window:Restored' accessible signal.
51 */ 51 */
52#define efl_access_window_restored_signal_emit(obj) \ 52#define efl_access_window_restored_signal_emit(obj) \
53 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL); 53 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, obj, EFL_ACCESS_WINDOW_EVENT_WINDOW_RESTORED, NULL);
54 54
55#endif 55#endif
56#endif 56#endif
diff --git a/src/lib/elementary/efl_ui_widget.c b/src/lib/elementary/efl_ui_widget.c
index eec2bde..7f4b0bd 100644
--- a/src/lib/elementary/efl_ui_widget.c
+++ b/src/lib/elementary/efl_ui_widget.c
@@ -1576,7 +1576,7 @@ _efl_ui_widget_widget_sub_object_add(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Ob
1576 if (_elm_config->atspi_mode && !sd->on_create) 1576 if (_elm_config->atspi_mode && !sd->on_create)
1577 { 1577 {
1578 Efl_Access_Object *aparent; 1578 Efl_Access_Object *aparent;
1579 aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_MIXIN); 1579 aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_CLASS);
1580 if (aparent) 1580 if (aparent)
1581 efl_access_children_changed_added_signal_emit(aparent, sobj); 1581 efl_access_children_changed_added_signal_emit(aparent, sobj);
1582 } 1582 }
@@ -1654,7 +1654,7 @@ _efl_ui_widget_widget_sub_object_del(Eo *obj, Elm_Widget_Smart_Data *sd, Evas_Ob
1654 if (_elm_config->atspi_mode && !sd->on_destroy) 1654 if (_elm_config->atspi_mode && !sd->on_destroy)
1655 { 1655 {
1656 Efl_Access_Object *aparent; 1656 Efl_Access_Object *aparent;
1657 aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_MIXIN); 1657 aparent = efl_provider_find(efl_parent_get(sobj), EFL_ACCESS_OBJECT_CLASS);
1658 if (aparent) 1658 if (aparent)
1659 efl_access_children_changed_del_signal_emit(aparent, sobj); 1659 efl_access_children_changed_del_signal_emit(aparent, sobj);
1660 } 1660 }
@@ -4028,6 +4028,9 @@ _elm_widget_item_efl_object_constructor(Eo *eo_item, Elm_Widget_Item_Data *item)
4028 item->eo_obj = eo_item; 4028 item->eo_obj = eo_item;
4029 efl_event_callback_add(eo_item, EFL_EVENT_DEL, _efl_del_cb, NULL); 4029 efl_event_callback_add(eo_item, EFL_EVENT_DEL, _efl_del_cb, NULL);
4030 4030
4031 Efl_Access_Object *access = efl_add(EFL_ACCESS_OBJECT_CLASS, eo_item);
4032 efl_composite_attach(eo_item, access);
4033
4031 return eo_item; 4034 return eo_item;
4032} 4035}
4033 4036
@@ -5342,6 +5345,8 @@ _efl_ui_widget_efl_object_constructor(Eo *obj, Elm_Widget_Smart_Data *sd EINA_UN
5342 efl_ui_widget_parent_set(obj, parent); 5345 efl_ui_widget_parent_set(obj, parent);
5343 sd->on_create = EINA_FALSE; 5346 sd->on_create = EINA_FALSE;
5344 5347
5348 Efl_Access_Object *access = efl_add(EFL_ACCESS_OBJECT_CLASS, obj);
5349 efl_composite_attach(obj, access);
5345 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN); 5350 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_UNKNOWN);
5346 5351
5347 return obj; 5352 return obj;
@@ -5476,7 +5481,7 @@ _efl_ui_widget_efl_access_object_access_children_get(const Eo *obj EINA_UNUSED,
5476 EINA_LIST_FOREACH(pd->subobjs, l, widget) 5481 EINA_LIST_FOREACH(pd->subobjs, l, widget)
5477 { 5482 {
5478 if (!elm_object_widget_check(widget)) continue; 5483 if (!elm_object_widget_check(widget)) continue;
5479 if (!efl_isa(widget, EFL_ACCESS_OBJECT_MIXIN)) continue; 5484 if (!efl_isa(widget, EFL_ACCESS_OBJECT_CLASS)) continue;
5480 type = efl_access_object_access_type_get(widget); 5485 type = efl_access_object_access_type_get(widget);
5481 if (type == EFL_ACCESS_TYPE_DISABLED) continue; 5486 if (type == EFL_ACCESS_TYPE_DISABLED) continue;
5482 if (type == EFL_ACCESS_TYPE_SKIPPED) 5487 if (type == EFL_ACCESS_TYPE_SKIPPED)
@@ -5624,7 +5629,7 @@ _efl_ui_widget_efl_object_provider_find(const Eo *obj, Elm_Widget_Smart_Data *pd
5624 if ((klass == EFL_CONFIG_INTERFACE) || (klass == EFL_CONFIG_GLOBAL_CLASS)) 5629 if ((klass == EFL_CONFIG_INTERFACE) || (klass == EFL_CONFIG_GLOBAL_CLASS))
5625 return _efl_config_obj; 5630 return _efl_config_obj;
5626 5631
5627 if (klass == EFL_ACCESS_OBJECT_MIXIN) 5632 if (klass == EFL_ACCESS_OBJECT_CLASS)
5628 { 5633 {
5629 Efl_Access_Type type = efl_access_object_access_type_get(obj); 5634 Efl_Access_Type type = efl_access_object_access_type_get(obj);
5630 if (type != EFL_ACCESS_TYPE_SKIPPED) 5635 if (type != EFL_ACCESS_TYPE_SKIPPED)
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 02ac728..c3a1afb 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -2370,7 +2370,7 @@ _efl_ui_win_show(Eo *obj, Efl_Ui_Win_Data *sd)
2370 { 2370 {
2371 Eo *root; 2371 Eo *root;
2372 efl_access_window_created_signal_emit(obj); 2372 efl_access_window_created_signal_emit(obj);
2373 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2373 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
2374 if (root) 2374 if (root)
2375 efl_access_children_changed_added_signal_emit(root, obj); 2375 efl_access_children_changed_added_signal_emit(root, obj);
2376 } 2376 }
@@ -2439,7 +2439,7 @@ _efl_ui_win_hide(Eo *obj, Efl_Ui_Win_Data *sd)
2439 if (_elm_config->atspi_mode) 2439 if (_elm_config->atspi_mode)
2440 { 2440 {
2441 Eo *root; 2441 Eo *root;
2442 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2442 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
2443 efl_access_window_destroyed_signal_emit(obj); 2443 efl_access_window_destroyed_signal_emit(obj);
2444 if (root) 2444 if (root)
2445 efl_access_children_changed_del_signal_emit(root, obj); 2445 efl_access_children_changed_del_signal_emit(root, obj);
@@ -7307,7 +7307,7 @@ _efl_ui_win_efl_object_provider_find(const Eo *obj,
7307 return (Eo *)obj; 7307 return (Eo *)obj;
7308 7308
7309 // attach all kinds of windows directly to ATSPI application root object 7309 // attach all kinds of windows directly to ATSPI application root object
7310 if (klass == EFL_ACCESS_OBJECT_MIXIN) return efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 7310 if (klass == EFL_ACCESS_OBJECT_CLASS) return efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
7311 7311
7312 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE) 7312 if (klass == EFL_UI_FOCUS_PARENT_PROVIDER_INTERFACE)
7313 return pd->provider; 7313 return pd->provider;
diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c
index 77cfe7f..87546a2 100644
--- a/src/lib/elementary/elm_atspi_app_object.c
+++ b/src/lib/elementary/elm_atspi_app_object.c
@@ -34,7 +34,7 @@ _elm_atspi_app_object_efl_access_object_access_children_get(const Eo *obj EINA_U
34 EINA_LIST_FOREACH(_elm_win_list, l, win) 34 EINA_LIST_FOREACH(_elm_win_list, l, win)
35 { 35 {
36 Efl_Access_Type type; 36 Efl_Access_Type type;
37 if (!efl_isa(win, EFL_ACCESS_OBJECT_MIXIN)) 37 if (!efl_isa(win, EFL_ACCESS_OBJECT_CLASS))
38 continue; 38 continue;
39 type = efl_access_object_access_type_get(win); 39 type = efl_access_object_access_type_get(win);
40 if (type == EFL_ACCESS_TYPE_REGULAR) 40 if (type == EFL_ACCESS_TYPE_REGULAR)
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index cca6176..833d5be 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -487,7 +487,7 @@ _accessible_get_role(const Eldbus_Service_Interface *iface, const Eldbus_Message
487 AtspiRole atspi_role = ATSPI_ROLE_INVALID; 487 AtspiRole atspi_role = ATSPI_ROLE_INVALID;
488 Efl_Access_Role role; 488 Efl_Access_Role role;
489 489
490 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 490 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
491 491
492 role = efl_access_object_role_get(obj); 492 role = efl_access_object_role_get(obj);
493 493
@@ -506,7 +506,7 @@ _accessible_get_role_name(const Eldbus_Service_Interface *iface, const Eldbus_Me
506 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 506 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
507 Eo *obj = _bridge_object_from_path(bridge, obj_path); 507 Eo *obj = _bridge_object_from_path(bridge, obj_path);
508 508
509 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 509 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
510 510
511 role_name = efl_access_object_role_name_get(obj); 511 role_name = efl_access_object_role_name_get(obj);
512 512
@@ -524,7 +524,7 @@ _accessible_get_localized_role_name(const Eldbus_Service_Interface *iface, const
524 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 524 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
525 Eo *obj = _bridge_object_from_path(bridge, obj_path); 525 Eo *obj = _bridge_object_from_path(bridge, obj_path);
526 526
527 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 527 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
528 528
529 l_role_name = efl_access_object_localized_role_name_get(obj); 529 l_role_name = efl_access_object_localized_role_name_get(obj);
530 EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL); 530 EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL);
@@ -547,7 +547,7 @@ _accessible_get_children(const Eldbus_Service_Interface *iface, const Eldbus_Mes
547 Eldbus_Message_Iter *iter, *iter_array; 547 Eldbus_Message_Iter *iter, *iter_array;
548 Eo *children; 548 Eo *children;
549 549
550 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 550 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
551 551
552 children_list = efl_access_object_access_children_get(obj); 552 children_list = efl_access_object_access_children_get(obj);
553 553
@@ -582,13 +582,13 @@ _accessible_get_application(const Eldbus_Service_Interface *iface, const Eldbus_
582 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 582 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
583 Eo *root, *obj = _bridge_object_from_path(bridge, obj_path); 583 Eo *root, *obj = _bridge_object_from_path(bridge, obj_path);
584 584
585 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 585 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
586 586
587 ret = eldbus_message_method_return_new(msg); 587 ret = eldbus_message_method_return_new(msg);
588 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 588 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
589 589
590 Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret); 590 Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret);
591 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 591 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
592 _bridge_iter_object_reference_append(bridge, iter, root); 592 _bridge_iter_object_reference_append(bridge, iter, root);
593 593
594 return ret; 594 return ret;
@@ -606,7 +606,7 @@ _accessible_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_M
606 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 606 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
607 Eo *obj = _bridge_object_from_path(bridge, obj_path); 607 Eo *obj = _bridge_object_from_path(bridge, obj_path);
608 608
609 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 609 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
610 610
611 ret = eldbus_message_method_return_new(msg); 611 ret = eldbus_message_method_return_new(msg);
612 if (!ret) goto error; 612 if (!ret) goto error;
@@ -648,7 +648,7 @@ _accessible_interfaces_get(const Eldbus_Service_Interface *iface, const Eldbus_M
648 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 648 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
649 Eo *obj = _bridge_object_from_path(bridge, obj_path); 649 Eo *obj = _bridge_object_from_path(bridge, obj_path);
650 650
651 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 651 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
652 652
653 ret = eldbus_message_method_return_new(msg); 653 ret = eldbus_message_method_return_new(msg);
654 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 654 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -718,7 +718,7 @@ _accessible_get_state(const Eldbus_Service_Interface *iface, const Eldbus_Messag
718 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 718 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
719 Eo *obj = _bridge_object_from_path(bridge, obj_path); 719 Eo *obj = _bridge_object_from_path(bridge, obj_path);
720 720
721 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 721 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
722 722
723 ret = eldbus_message_method_return_new(msg); 723 ret = eldbus_message_method_return_new(msg);
724 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 724 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -754,7 +754,7 @@ _accessible_get_index_in_parent(const Eldbus_Service_Interface *iface EINA_UNUSE
754 Eldbus_Message *ret; 754 Eldbus_Message *ret;
755 int idx = -1; 755 int idx = -1;
756 756
757 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 757 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
758 758
759 ret = eldbus_message_method_return_new(msg); 759 ret = eldbus_message_method_return_new(msg);
760 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 760 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -778,7 +778,7 @@ _accessible_child_at_index(const Eldbus_Service_Interface *iface EINA_UNUSED, co
778 Eldbus_Message *ret; 778 Eldbus_Message *ret;
779 Eldbus_Message_Iter *iter; 779 Eldbus_Message_Iter *iter;
780 780
781 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 781 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
782 782
783 if (!eldbus_message_arguments_get(msg, "i", &idx)) 783 if (!eldbus_message_arguments_get(msg, "i", &idx))
784 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 784 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -809,7 +809,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED,
809 Eina_List *l; 809 Eina_List *l;
810 Eina_Iterator *it; 810 Eina_Iterator *it;
811 811
812 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 812 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
813 813
814 ret = eldbus_message_method_return_new(msg); 814 ret = eldbus_message_method_return_new(msg);
815 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 815 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -1220,7 +1220,7 @@ _image_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *
1220 Eo *obj = _bridge_object_from_path(bridge, obj_path); 1220 Eo *obj = _bridge_object_from_path(bridge, obj_path);
1221 Eina_Rect r; 1221 Eina_Rect r;
1222 1222
1223 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 1223 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
1224 1224
1225 if (!eldbus_message_arguments_get(msg, "u", &type)) 1225 if (!eldbus_message_arguments_get(msg, "u", &type))
1226 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 1226 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -1246,7 +1246,7 @@ _image_position_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
1246 int x = -1, y = -1; 1246 int x = -1, y = -1;
1247 Eina_Bool screen_coords; 1247 Eina_Bool screen_coords;
1248 1248
1249 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 1249 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
1250 1250
1251 if (!eldbus_message_arguments_get(msg, "u", &type)) 1251 if (!eldbus_message_arguments_get(msg, "u", &type))
1252 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 1252 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -1274,7 +1274,7 @@ _image_size_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg
1274 Eo *obj = _bridge_object_from_path(bridge, obj_path); 1274 Eo *obj = _bridge_object_from_path(bridge, obj_path);
1275 int w = -1, h = -1; 1275 int w = -1, h = -1;
1276 1276
1277 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 1277 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
1278 1278
1279 ret = eldbus_message_method_return_new(msg); 1279 ret = eldbus_message_method_return_new(msg);
1280 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1280 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -2028,7 +2028,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
2028 tmp = path + len; /* Skip over the prefix */ 2028 tmp = path + len; /* Skip over the prefix */
2029 if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp)) 2029 if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp))
2030 { 2030 {
2031 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2031 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
2032 return root; 2032 return root;
2033 } 2033 }
2034 2034
@@ -2042,7 +2042,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
2042 return NULL; 2042 return NULL;
2043 } 2043 }
2044 2044
2045 ret = efl_isa(eo, EFL_ACCESS_OBJECT_MIXIN) ? eo : NULL; 2045 ret = efl_isa(eo, EFL_ACCESS_OBJECT_CLASS) ? eo : NULL;
2046 2046
2047 return ret; 2047 return ret;
2048} 2048}
@@ -2055,7 +2055,7 @@ _path_from_object(const Eo *eo)
2055 2055
2056 if (!eo) 2056 if (!eo)
2057 return ATSPI_DBUS_PATH_NULL; 2057 return ATSPI_DBUS_PATH_NULL;
2058 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2058 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
2059 2059
2060 if (eo == root) 2060 if (eo == root)
2061 snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT); 2061 snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT);
@@ -2073,7 +2073,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
2073 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); 2073 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
2074 Eo *ret_obj = NULL, *obj = _bridge_object_from_path(bridge, obj_path); 2074 Eo *ret_obj = NULL, *obj = _bridge_object_from_path(bridge, obj_path);
2075 2075
2076 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, request_msg, error); 2076 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, request_msg, error);
2077 2077
2078 if (!strcmp(property, "Name")) 2078 if (!strcmp(property, "Name"))
2079 { 2079 {
@@ -2093,7 +2093,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
2093 } 2093 }
2094 else if (!strcmp(property, "Parent")) 2094 else if (!strcmp(property, "Parent"))
2095 { 2095 {
2096 ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 2096 ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
2097 Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID; 2097 Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID;
2098 role = efl_access_object_role_get(obj); 2098 role = efl_access_object_role_get(obj);
2099 if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role)) 2099 if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role))
@@ -2233,7 +2233,7 @@ _image_properties_get(const Eldbus_Service_Interface *interface, const char *pro
2233 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); 2233 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
2234 Eo *obj = _bridge_object_from_path(bridge, obj_path); 2234 Eo *obj = _bridge_object_from_path(bridge, obj_path);
2235 2235
2236 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, request_msg, error); 2236 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, request_msg, error);
2237 2237
2238 if (!strcmp(property, "ImageDescription")) 2238 if (!strcmp(property, "ImageDescription"))
2239 { 2239 {
@@ -2820,7 +2820,7 @@ _collection_sort_order_reverse_canonical(struct collection_match_rule *rule, Ein
2820 2820
2821 /* Get the current nodes index in it's parent and the parent object. */ 2821 /* Get the current nodes index in it's parent and the parent object. */
2822 indexinparent = efl_access_object_index_in_parent_get(obj); 2822 indexinparent = efl_access_object_index_in_parent_get(obj);
2823 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 2823 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
2824 2824
2825 if ((indexinparent > 0) && ((max == 0) || (count < max))) 2825 if ((indexinparent > 0) && ((max == 0) || (count < max)))
2826 { 2826 {
@@ -2876,7 +2876,7 @@ _collection_inorder(Eo *collection, struct collection_match_rule *rule, Eina_Lis
2876 while ((max == 0 || count < max) && obj && obj != collection) 2876 while ((max == 0 || count < max) && obj && obj != collection)
2877 { 2877 {
2878 Eo *parent; 2878 Eo *parent;
2879 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 2879 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
2880 idx = efl_access_object_index_in_parent_get(obj); 2880 idx = efl_access_object_index_in_parent_get(obj);
2881 count = _collection_sort_order_canonical(rule, list, count, max, parent, 2881 count = _collection_sort_order_canonical(rule, list, count, max, parent,
2882 idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse); 2882 idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse);
@@ -2954,7 +2954,7 @@ _collection_get_matches_from_handle(Eo *collection, Eo *current, struct collecti
2954 break; 2954 break;
2955 case ATSPI_Collection_TREE_RESTRICT_CHILDREN: 2955 case ATSPI_Collection_TREE_RESTRICT_CHILDREN:
2956 idx = efl_access_object_index_in_parent_get(current); 2956 idx = efl_access_object_index_in_parent_get(current);
2957 parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_OBJECT_MIXIN); 2957 parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_OBJECT_CLASS);
2958 _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse); 2958 _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse);
2959 break; 2959 break;
2960 case ATSPI_Collection_TREE_RESTRICT_SIBLING: 2960 case ATSPI_Collection_TREE_RESTRICT_SIBLING:
@@ -2982,7 +2982,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED,
2982 AtspiCollectionSortOrder sortby; 2982 AtspiCollectionSortOrder sortby;
2983 Eina_List *result = NULL; 2983 Eina_List *result = NULL;
2984 2984
2985 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 2985 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
2986 2986
2987 iter = eldbus_message_iter_get(msg); 2987 iter = eldbus_message_iter_get(msg);
2988 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); 2988 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
@@ -2994,7 +2994,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED,
2994 2994
2995 current = _bridge_object_from_path(bridge, obj_path); 2995 current = _bridge_object_from_path(bridge, obj_path);
2996 2996
2997 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_MIXIN, msg); 2997 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_CLASS, msg);
2998 2998
2999 if (!_collection_iter_match_rule_get(rule_iter, &rule)) 2999 if (!_collection_iter_match_rule_get(rule_iter, &rule))
3000 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters."); 3000 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters.");
@@ -3015,7 +3015,7 @@ _collection_get_matches_to_handle(Eo *obj, Eo *current, struct collection_match_
3015 Eo *collection = obj; 3015 Eo *collection = obj;
3016 3016
3017 if (limit) 3017 if (limit)
3018 collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 3018 collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
3019 3019
3020 switch (tree) 3020 switch (tree)
3021 { 3021 {
@@ -3054,7 +3054,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co
3054 Eina_List *result = NULL; 3054 Eina_List *result = NULL;
3055 Eina_Bool limit; 3055 Eina_Bool limit;
3056 3056
3057 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 3057 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
3058 3058
3059 iter = eldbus_message_iter_get(msg); 3059 iter = eldbus_message_iter_get(msg);
3060 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); 3060 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
@@ -3066,7 +3066,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co
3066 3066
3067 current = _bridge_object_from_path(bridge, obj_path); 3067 current = _bridge_object_from_path(bridge, obj_path);
3068 3068
3069 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_MIXIN, msg); 3069 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_CLASS, msg);
3070 3070
3071 if (!_collection_iter_match_rule_get(rule_iter, &rule)) 3071 if (!_collection_iter_match_rule_get(rule_iter, &rule))
3072 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters."); 3072 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters.");
@@ -3094,7 +3094,7 @@ _collection_get_matches(const Eldbus_Service_Interface *iface, const Eldbus_Mess
3094 AtspiCollectionSortOrder sortby; 3094 AtspiCollectionSortOrder sortby;
3095 Eina_List *result = NULL; 3095 Eina_List *result = NULL;
3096 3096
3097 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 3097 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
3098 3098
3099 iter = eldbus_message_iter_get(msg); 3099 iter = eldbus_message_iter_get(msg);
3100 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); 3100 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
@@ -3168,7 +3168,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
3168 iter_array = eldbus_message_iter_container_new(iter, 'a', "s"); 3168 iter_array = eldbus_message_iter_container_new(iter, 'a', "s");
3169 if (!iter_array) return; 3169 if (!iter_array) return;
3170 3170
3171 if (efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN)) 3171 if (efl_isa(obj, EFL_ACCESS_OBJECT_CLASS))
3172 { 3172 {
3173 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE); 3173 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE);
3174 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION); 3174 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION);
@@ -3181,7 +3181,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
3181 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT); 3181 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT);
3182 if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE)) 3182 if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE))
3183 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT); 3183 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
3184 if (efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN)) 3184 if (efl_isa(obj, EFL_ACCESS_OBJECT_CLASS))
3185 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE); 3185 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE);
3186 if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE)) 3186 if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE))
3187 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION); 3187 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION);
@@ -3203,7 +3203,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
3203 Efl_Access_State_Set states; 3203 Efl_Access_State_Set states;
3204 Efl_Access_Role role; 3204 Efl_Access_Role role;
3205 Eo *root; 3205 Eo *root;
3206 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3206 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
3207 3207
3208 role = efl_access_object_role_get(data); 3208 role = efl_access_object_role_get(data);
3209 3209
@@ -3217,7 +3217,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
3217 _bridge_iter_object_reference_append(bridge, iter_struct, root); 3217 _bridge_iter_object_reference_append(bridge, iter_struct, root);
3218 3218
3219 Eo *parent = NULL; 3219 Eo *parent = NULL;
3220 parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_OBJECT_MIXIN); 3220 parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_OBJECT_CLASS);
3221 /* Marshall parent */ 3221 /* Marshall parent */
3222 if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role)) 3222 if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role))
3223 _object_desktop_reference_append(iter_struct); 3223 _object_desktop_reference_append(iter_struct);
@@ -3300,7 +3300,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
3300 iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE); 3300 iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE);
3301 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); 3301 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
3302 3302
3303 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3303 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
3304 to_process = eina_list_append(NULL, root); 3304 to_process = eina_list_append(NULL, root);
3305 3305
3306 while (to_process) 3306 while (to_process)
@@ -3705,7 +3705,7 @@ _elm_atspi_bridge_app_register(Eo *bridge)
3705 "Embed"); 3705 "Embed");
3706 Eldbus_Message_Iter *iter = eldbus_message_iter_get(message); 3706 Eldbus_Message_Iter *iter = eldbus_message_iter_get(message);
3707 3707
3708 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3708 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
3709 _bridge_iter_object_reference_append(bridge, iter, root); 3709 _bridge_iter_object_reference_append(bridge, iter, root);
3710 eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1); 3710 eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1);
3711 3711
@@ -3718,7 +3718,7 @@ _elm_atspi_bridge_app_unregister(Eo *bridge)
3718 Eo *root; 3718 Eo *root;
3719 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE); 3719 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE);
3720 3720
3721 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3721 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
3722 3722
3723 Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY, 3723 Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY,
3724 ATSPI_DBUS_PATH_ROOT, 3724 ATSPI_DBUS_PATH_ROOT,
@@ -4118,7 +4118,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld
4118 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); 4118 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
4119 4119
4120 path = _path_from_object(obj); 4120 path = _path_from_object(obj);
4121 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 4121 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
4122 4122
4123 msg = eldbus_message_signal_new(path, infc, signal->name); 4123 msg = eldbus_message_signal_new(path, infc, signal->name);
4124 if (!msg) return; 4124 if (!msg) return;
@@ -4368,7 +4368,7 @@ _a11y_connection_shutdown(Eo *bridge)
4368 if (pd->event_hash) eina_hash_free(pd->event_hash); 4368 if (pd->event_hash) eina_hash_free(pd->event_hash);
4369 pd->event_hash = NULL; 4369 pd->event_hash = NULL;
4370 4370
4371 efl_access_object_event_handler_del(EFL_ACCESS_OBJECT_MIXIN, pd->event_hdlr); 4371 efl_access_object_event_handler_del(EFL_ACCESS_OBJECT_CLASS, pd->event_hdlr);
4372 pd->event_hdlr = NULL; 4372 pd->event_hdlr = NULL;
4373 4373
4374 efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL); 4374 efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
@@ -4460,7 +4460,7 @@ _a11y_bus_initialize(Eo *obj, const char *socket_addr)
4460 _elm_atspi_bridge_app_register(obj); 4460 _elm_atspi_bridge_app_register(obj);
4461 4461
4462 // register accessible object event listener 4462 // register accessible object event listener
4463 pd->event_hdlr = efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _bridge_accessible_event_dispatch, obj); 4463 pd->event_hdlr = efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_CLASS, _bridge_accessible_event_dispatch, obj);
4464} 4464}
4465 4465
4466static void 4466static void
@@ -4538,7 +4538,7 @@ static void _bridge_object_register(Eo *bridge, Eo *obj)
4538{ 4538{
4539 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); 4539 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
4540 4540
4541 if (!efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN)) 4541 if (!efl_isa(obj, EFL_ACCESS_OBJECT_CLASS))
4542 { 4542 {
4543 WRN("Unable to register class w/o Efl_Access_Object!"); 4543 WRN("Unable to register class w/o Efl_Access_Object!");
4544 return; 4544 return;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index dac8e91..1bcd007 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -2225,14 +2225,14 @@ _entry_changed_user_signal_cb(void *data,
2225 atspi_info.content = edje_info->change.insert.content; 2225 atspi_info.content = edje_info->change.insert.content;
2226 atspi_info.pos = edje_info->change.insert.pos; 2226 atspi_info.pos = edje_info->change.insert.pos;
2227 atspi_info.len = edje_info->change.insert.plain_length; 2227 atspi_info.len = edje_info->change.insert.plain_length;
2228 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info); 2228 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, &atspi_info);
2229 } 2229 }
2230 else if (edje_info && !edje_info->insert) 2230 else if (edje_info && !edje_info->insert)
2231 { 2231 {
2232 atspi_info.content = edje_info->change.del.content; 2232 atspi_info.content = edje_info->change.del.content;
2233 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end); 2233 atspi_info.pos = MIN(edje_info->change.del.start, edje_info->change.del.end);
2234 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos; 2234 atspi_info.len = MAX(edje_info->change.del.start, edje_info->change.del.end) - atspi_info.pos;
2235 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info); 2235 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_REMOVED, &atspi_info);
2236 } 2236 }
2237 } 2237 }
2238} 2238}
@@ -2257,7 +2257,7 @@ _entry_preedit_changed_signal_cb(void *data,
2257 atspi_info.content = text; 2257 atspi_info.content = text;
2258 atspi_info.pos = edje_info->change.insert.pos; 2258 atspi_info.pos = edje_info->change.insert.pos;
2259 atspi_info.len = edje_info->change.insert.plain_length; 2259 atspi_info.len = edje_info->change.insert.plain_length;
2260 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, 2260 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS,
2261 data, 2261 data,
2262 EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED, 2262 EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_INSERTED,
2263 &atspi_info); 2263 &atspi_info);
@@ -2349,7 +2349,7 @@ _entry_selection_changed_signal_cb(void *data,
2349 _selection_store(ELM_SEL_TYPE_PRIMARY, data); 2349 _selection_store(ELM_SEL_TYPE_PRIMARY, data);
2350 _update_selection_handler(data); 2350 _update_selection_handler(data);
2351 if (_elm_config->atspi_mode) 2351 if (_elm_config->atspi_mode)
2352 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL); 2352 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_SELECTION_CHANGED, NULL);
2353} 2353}
2354 2354
2355static void 2355static void
@@ -2460,7 +2460,7 @@ _entry_cursor_changed_signal_cb(void *data,
2460 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL); 2460 efl_event_callback_legacy_call(data, ELM_ENTRY_EVENT_CURSOR_CHANGED, NULL);
2461 2461
2462 if (_elm_config->atspi_mode) 2462 if (_elm_config->atspi_mode)
2463 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2463 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2464} 2464}
2465 2465
2466static void 2466static void
@@ -2472,7 +2472,7 @@ _entry_cursor_changed_manual_signal_cb(void *data,
2472 efl_event_callback_legacy_call 2472 efl_event_callback_legacy_call
2473 (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL); 2473 (data, ELM_ENTRY_EVENT_CURSOR_CHANGED_MANUAL, NULL);
2474 if (_elm_config->atspi_mode) 2474 if (_elm_config->atspi_mode)
2475 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL); 2475 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, data, EFL_ACCESS_TEXT_EVENT_ACCESS_TEXT_CARET_MOVED, NULL);
2476} 2476}
2477 2477
2478static void 2478static void
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 53cc85f..9ec49c7 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -498,7 +498,7 @@ _menu_item_activate_cb(void *data,
498 if (eo_item2 != EO_OBJ(item)) 498 if (eo_item2 != EO_OBJ(item))
499 elm_menu_item_selected_set(eo_item2, 0); 499 elm_menu_item_selected_set(eo_item2, 0);
500 } 500 }
501 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); 501 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, EO_OBJ(item->parent), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
502 } 502 }
503 else 503 else
504 { 504 {
@@ -513,7 +513,7 @@ _menu_item_activate_cb(void *data,
513 elm_menu_item_selected_set(eo_item2, 0); 513 elm_menu_item_selected_set(eo_item2, 0);
514 } 514 }
515 } 515 }
516 efl_access_object_event_emit(EFL_ACCESS_OBJECT_MIXIN, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL); 516 efl_access_object_event_emit(EFL_ACCESS_OBJECT_CLASS, WIDGET(item), EFL_ACCESS_SELECTION_EVENT_SELECTION_CHANGED, NULL);
517 if (sd->menu_bar && was_open) 517 if (sd->menu_bar && was_open)
518 _menu_item_select_cb(item, NULL, NULL, NULL); 518 _menu_item_select_cb(item, NULL, NULL, NULL);
519 } 519 }