summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLukasz Stanislawski <l.stanislaws@samsung.com>2017-09-12 15:49:29 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-09-12 15:49:29 +0900
commit9cf8e756686b1e339ccd2505fbcfac4f579903a6 (patch)
tree1775a102af5da96861009b0f148314d55b5caffd /src
parenta55f2c96d4953b1a95b4c7aa3a094a9d19f4a7d1 (diff)
elm: rename Elm.Interface.Atspi.Component => Efl.Access.Component
Reviewers: jpeg, cedric Differential Revision: https://phab.enlightenment.org/D5164
Diffstat (limited to 'src')
-rw-r--r--src/Makefile_Elementary.am4
-rw-r--r--src/lib/elementary/efl_access_component.c (renamed from src/lib/elementary/elm_interface_atspi_component.c)46
-rw-r--r--src/lib/elementary/efl_access_component.eo (renamed from src/lib/elementary/elm_interface_atspi_component.eo)3
-rw-r--r--src/lib/elementary/efl_ui_win.c4
-rw-r--r--src/lib/elementary/efl_ui_win.eo4
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c46
-rw-r--r--src/lib/elementary/elm_colorselector.c2
-rw-r--r--src/lib/elementary/elm_index.c2
-rw-r--r--src/lib/elementary/elm_interfaces.h4
-rw-r--r--src/lib/elementary/elm_widget.c14
-rw-r--r--src/lib/elementary/elm_widget.eo4
-rw-r--r--src/lib/elementary/elm_widget_item.eo10
12 files changed, 71 insertions, 72 deletions
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 04331a3582..f1eb3fd8b7 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -30,7 +30,7 @@ elm_public_eolian_files = \
30 lib/elementary/elm_index.eo \ 30 lib/elementary/elm_index.eo \
31 lib/elementary/elm_interface_atspi_accessible.eo \ 31 lib/elementary/elm_interface_atspi_accessible.eo \
32 lib/elementary/elm_interface_atspi_action.eo \ 32 lib/elementary/elm_interface_atspi_action.eo \
33 lib/elementary/elm_interface_atspi_component.eo \ 33 lib/elementary/efl_access_component.eo \
34 lib/elementary/elm_interface_atspi_text_editable.eo \ 34 lib/elementary/elm_interface_atspi_text_editable.eo \
35 lib/elementary/efl_access_image.eo \ 35 lib/elementary/efl_access_image.eo \
36 lib/elementary/elm_interface_atspi_selection.eo \ 36 lib/elementary/elm_interface_atspi_selection.eo \
@@ -611,7 +611,7 @@ lib_elementary_libelementary_la_SOURCES = \
611 lib/elementary/elm_index.c \ 611 lib/elementary/elm_index.c \
612 lib/elementary/elm_interface_atspi_accessible.c \ 612 lib/elementary/elm_interface_atspi_accessible.c \
613 lib/elementary/elm_interface_atspi_action.c \ 613 lib/elementary/elm_interface_atspi_action.c \
614 lib/elementary/elm_interface_atspi_component.c \ 614 lib/elementary/efl_access_component.c \
615 lib/elementary/elm_interface_atspi_text_editable.c \ 615 lib/elementary/elm_interface_atspi_text_editable.c \
616 lib/elementary/efl_access_image.c \ 616 lib/elementary/efl_access_image.c \
617 lib/elementary/elm_interface_atspi_selection.c \ 617 lib/elementary/elm_interface_atspi_selection.c \
diff --git a/src/lib/elementary/elm_interface_atspi_component.c b/src/lib/elementary/efl_access_component.c
index e2d8ccab87..6a4e1566ab 100644
--- a/src/lib/elementary/elm_interface_atspi_component.c
+++ b/src/lib/elementary/efl_access_component.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED 5#define EFL_ACCESS_COMPONENT_PROTECTED
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
7 7
8#include <Elementary.h> 8#include <Elementary.h>
@@ -11,46 +11,46 @@
11 11
12 12
13EOLIAN static void 13EOLIAN static void
14_elm_interface_atspi_component_position_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int *x, int *y) 14_efl_access_component_position_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int *x, int *y)
15{ 15{
16 elm_interface_atspi_component_extents_get(obj, type, x, y, NULL, NULL); 16 efl_access_component_extents_get(obj, type, x, y, NULL, NULL);
17} 17}
18 18
19EOLIAN static Eina_Bool 19EOLIAN static Eina_Bool
20_elm_interface_atspi_component_position_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int x, int y) 20_efl_access_component_position_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int x, int y)
21{ 21{
22 Eina_Bool ret = EINA_FALSE; 22 Eina_Bool ret = EINA_FALSE;
23 int c_w, c_h; 23 int c_w, c_h;
24 24
25 elm_interface_atspi_component_extents_get(obj, type, NULL, NULL, &c_w, &c_h); 25 efl_access_component_extents_get(obj, type, NULL, NULL, &c_w, &c_h);
26 ret = elm_interface_atspi_component_extents_set(obj, type, x, y, c_w, c_h); 26 ret = efl_access_component_extents_set(obj, type, x, y, c_w, c_h);
27 27
28 return ret; 28 return ret;
29} 29}
30 30
31EOLIAN static Eina_Bool 31EOLIAN static Eina_Bool
32_elm_interface_atspi_component_size_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, int w, int h) 32_efl_access_component_size_set(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, int w, int h)
33{ 33{
34 Eina_Bool ret; 34 Eina_Bool ret;
35 int c_x = 0, c_y = 0; 35 int c_x = 0, c_y = 0;
36 36
37 elm_interface_atspi_component_extents_get(obj, EINA_FALSE, &c_x, &c_y, NULL, NULL); 37 efl_access_component_extents_get(obj, EINA_FALSE, &c_x, &c_y, NULL, NULL);
38 ret = elm_interface_atspi_component_extents_set(obj, EINA_FALSE, c_x, c_y, w, h); 38 ret = efl_access_component_extents_set(obj, EINA_FALSE, c_x, c_y, w, h);
39 return ret; 39 return ret;
40} 40}
41 41
42EOLIAN static void 42EOLIAN static void
43_elm_interface_atspi_component_size_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, int *w, int *h) 43_efl_access_component_size_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, int *w, int *h)
44{ 44{
45 elm_interface_atspi_component_extents_get(obj, EINA_FALSE, NULL, NULL, w, h); 45 efl_access_component_extents_get(obj, EINA_FALSE, NULL, NULL, w, h);
46} 46}
47 47
48EOLIAN static Eina_Bool 48EOLIAN static Eina_Bool
49_elm_interface_atspi_component_contains(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int x, int y) 49_efl_access_component_contains(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, Eina_Bool type, int x, int y)
50{ 50{
51 int w_x = 0, w_y = 0, w_w = 0, w_h = 0; 51 int w_x = 0, w_y = 0, w_w = 0, w_h = 0;
52 52
53 elm_interface_atspi_component_extents_get(obj, type, &w_x, &w_y, &w_w, &w_h); 53 efl_access_component_extents_get(obj, type, &w_x, &w_y, &w_w, &w_h);
54 54
55 if ((x >= w_x) && (x <= w_x + w_w) && (y >= w_y) && (y <= w_y + w_h)) 55 if ((x >= w_x) && (x <= w_x + w_w) && (y >= w_y) && (y <= w_y + w_h))
56 return EINA_TRUE; 56 return EINA_TRUE;
@@ -58,7 +58,7 @@ _elm_interface_atspi_component_contains(Eo *obj EINA_UNUSED, void *_pd EINA_UNUS
58} 58}
59 59
60EOLIAN static double 60EOLIAN static double
61_elm_interface_atspi_component_alpha_get(Eo *obj, void *_pd EINA_UNUSED) 61_efl_access_component_alpha_get(Eo *obj, void *_pd EINA_UNUSED)
62{ 62{
63 int alpha; 63 int alpha;
64 64
@@ -67,7 +67,7 @@ _elm_interface_atspi_component_alpha_get(Eo *obj, void *_pd EINA_UNUSED)
67} 67}
68 68
69EOLIAN static Eo * 69EOLIAN static Eo *
70_elm_interface_atspi_component_accessible_at_point_get(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool screen_coords, int x, int y) 70_efl_access_component_accessible_at_point_get(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool screen_coords, int x, int y)
71{ 71{
72 Eina_List *l, *children; 72 Eina_List *l, *children;
73 Eo *ret = NULL, *child; 73 Eo *ret = NULL, *child;
@@ -77,9 +77,9 @@ _elm_interface_atspi_component_accessible_at_point_get(Eo *obj, void *_pd EINA_U
77 EINA_LIST_FOREACH(children, l, child) 77 EINA_LIST_FOREACH(children, l, child)
78 { 78 {
79 Eina_Bool contains; 79 Eina_Bool contains;
80 if (efl_isa(child, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN)) 80 if (efl_isa(child, EFL_ACCESS_COMPONENT_MIXIN))
81 { 81 {
82 contains = elm_interface_atspi_component_contains(child, screen_coords, x, y); 82 contains = efl_access_component_contains(child, screen_coords, x, y);
83 if (contains) 83 if (contains)
84 { 84 {
85 ret = child; 85 ret = child;
@@ -93,7 +93,7 @@ _elm_interface_atspi_component_accessible_at_point_get(Eo *obj, void *_pd EINA_U
93} 93}
94 94
95EOLIAN static void 95EOLIAN static void
96_elm_interface_atspi_component_extents_get(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h) 96_efl_access_component_extents_get(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h)
97{ 97{
98 int ee_x, ee_y; 98 int ee_x, ee_y;
99 99
@@ -109,7 +109,7 @@ _elm_interface_atspi_component_extents_get(Eo *obj, void *_pd EINA_UNUSED, Eina_
109} 109}
110 110
111EOLIAN static Eina_Bool 111EOLIAN static Eina_Bool
112_elm_interface_atspi_component_extents_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool screen_coords, int x, int y, int w, int h) 112_efl_access_component_extents_set(Eo *obj, void *_pd EINA_UNUSED, Eina_Bool screen_coords, int x, int y, int w, int h)
113{ 113{
114 int wx, wy; 114 int wx, wy;
115 115
@@ -130,23 +130,23 @@ _elm_interface_atspi_component_extents_set(Eo *obj, void *_pd EINA_UNUSED, Eina_
130} 130}
131 131
132EOLIAN static int 132EOLIAN static int
133_elm_interface_atspi_component_layer_get(Eo *obj, void *_pd EINA_UNUSED) 133_efl_access_component_layer_get(Eo *obj, void *_pd EINA_UNUSED)
134{ 134{
135 return evas_object_layer_get(obj); 135 return evas_object_layer_get(obj);
136} 136}
137 137
138EOLIAN static int 138EOLIAN static int
139_elm_interface_atspi_component_z_order_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) 139_efl_access_component_z_order_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED)
140{ 140{
141 // Currently not used. 141 // Currently not used.
142 return 0; 142 return 0;
143} 143}
144 144
145EOLIAN static Eina_Bool 145EOLIAN static Eina_Bool
146_elm_interface_atspi_component_focus_grab(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) 146_efl_access_component_focus_grab(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED)
147{ 147{
148 evas_object_focus_set(obj, EINA_TRUE); 148 evas_object_focus_set(obj, EINA_TRUE);
149 return evas_object_focus_get(obj); 149 return evas_object_focus_get(obj);
150} 150}
151 151
152#include "elm_interface_atspi_component.eo.c" 152#include "efl_access_component.eo.c"
diff --git a/src/lib/elementary/elm_interface_atspi_component.eo b/src/lib/elementary/efl_access_component.eo
index d43db98fbc..cb294b0ea7 100644
--- a/src/lib/elementary/elm_interface_atspi_component.eo
+++ b/src/lib/elementary/efl_access_component.eo
@@ -1,7 +1,6 @@
1mixin Elm.Interface.Atspi_Component () 1mixin Efl.Access.Component ()
2{ 2{
3 [[AT-SPI component mixin]] 3 [[AT-SPI component mixin]]
4 eo_prefix: elm_interface_atspi_component;
5 data: null; 4 data: null;
6 methods { 5 methods {
7 @property size @protected { 6 @property size @protected {
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index fdd2a9b234..3f96323947 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED 6#define EFL_ACCESS_COMPONENT_PROTECTED
7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
8#define EFL_INPUT_EVENT_PROTECTED 8#define EFL_INPUT_EVENT_PROTECTED
9#define EFL_GFX_SIZE_HINT_PROTECTED 9#define EFL_GFX_SIZE_HINT_PROTECTED
@@ -6717,7 +6717,7 @@ _efl_ui_win_elm_interface_atspi_accessible_name_get(Eo *obj, Efl_Ui_Win_Data *sd
6717} 6717}
6718 6718
6719EOLIAN static void 6719EOLIAN static void
6720_efl_ui_win_elm_interface_atspi_component_extents_get(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h) 6720_efl_ui_win_efl_access_component_extents_get(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h)
6721{ 6721{
6722 int ee_x, ee_y; 6722 int ee_x, ee_y;
6723 6723
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index ae09d5c3f5..bcd0b99bbb 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -158,7 +158,7 @@ enum Efl.Ui.Win.Move_Resize_Mode
158} 158}
159 159
160class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window, 160class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window,
161 Elm.Interface.Atspi_Component, Elm.Interface.Atspi_Widget_Action, 161 Efl.Access.Component, Elm.Interface.Atspi_Widget_Action,
162 Efl.Container, Efl.Input.State, Efl.Input.Interface, Efl.Screen, 162 Efl.Container, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
163 Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part, Efl.Ui.Focus.Manager ) 163 Efl.Gfx.Size.Hint, Efl.Text, Efl.Config.Global, Efl.Part, Efl.Ui.Focus.Manager )
164{ 164{
@@ -837,7 +837,7 @@ class Efl.Ui.Win (Elm.Widget, Efl.Canvas, Efl.Access.Window,
837 Elm.Interface.Atspi_Accessible.parent { get; } 837 Elm.Interface.Atspi_Accessible.parent { get; }
838 Elm.Interface.Atspi_Accessible.state_set { get; } 838 Elm.Interface.Atspi_Accessible.state_set { get; }
839 Elm.Interface.Atspi_Accessible.name { get; } 839 Elm.Interface.Atspi_Accessible.name { get; }
840 Elm.Interface.Atspi_Component.extents { get; } 840 Efl.Access.Component.extents { get; }
841 Elm.Interface.Atspi_Widget_Action.elm_actions { get; } 841 Elm.Interface.Atspi_Widget_Action.elm_actions { get; }
842 Efl.Input.State.modifier_enabled { get; } 842 Efl.Input.State.modifier_enabled { get; }
843 Efl.Input.State.lock_enabled { get; } 843 Efl.Input.State.lock_enabled { get; }
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index 6563754d23..ed8a813951 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -2,7 +2,7 @@
2# include "elementary_config.h" 2# include "elementary_config.h"
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED 5#define EFL_ACCESS_COMPONENT_PROTECTED
6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 6#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
7#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED 7#define ELM_INTERFACE_ATSPI_ACTION_PROTECTED
8#define EFL_ACCESS_VALUE_PROTECTED 8#define EFL_ACCESS_VALUE_PROTECTED
@@ -2502,7 +2502,7 @@ _collection_iter_match_rule_get(Eldbus_Message_Iter *iter, struct collection_mat
2502 if (!strcmp(ifc_name, "action")) 2502 if (!strcmp(ifc_name, "action"))
2503 class = ELM_INTERFACE_ATSPI_ACTION_MIXIN; 2503 class = ELM_INTERFACE_ATSPI_ACTION_MIXIN;
2504 else if (!strcmp(ifc_name, "component")) 2504 else if (!strcmp(ifc_name, "component"))
2505 class = ELM_INTERFACE_ATSPI_COMPONENT_MIXIN; 2505 class = EFL_ACCESS_COMPONENT_MIXIN;
2506 else if (!strcmp(ifc_name, "editabletext")) 2506 else if (!strcmp(ifc_name, "editabletext"))
2507 class = ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE; 2507 class = ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE;
2508 else if (!strcmp(ifc_name, "text")) 2508 else if (!strcmp(ifc_name, "text"))
@@ -3124,7 +3124,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
3124 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACTION); 3124 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACTION);
3125 if (efl_isa(obj, ELM_ATSPI_APP_OBJECT_CLASS)) 3125 if (efl_isa(obj, ELM_ATSPI_APP_OBJECT_CLASS))
3126 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_APPLICATION); 3126 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_APPLICATION);
3127 if (efl_isa(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN)) 3127 if (efl_isa(obj, EFL_ACCESS_COMPONENT_MIXIN))
3128 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT); 3128 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT);
3129 if (efl_isa(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE)) 3129 if (efl_isa(obj, ELM_INTERFACE_ATSPI_TEXT_EDITABLE_INTERFACE))
3130 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT); 3130 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
@@ -3297,13 +3297,13 @@ _component_contains(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eld
3297 AtspiCoordType coord_type; 3297 AtspiCoordType coord_type;
3298 Eldbus_Message *ret; 3298 Eldbus_Message *ret;
3299 3299
3300 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); 3300 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg);
3301 3301
3302 if (!eldbus_message_arguments_get(msg, "iiu", &x, &y, &coord_type)) 3302 if (!eldbus_message_arguments_get(msg, "iiu", &x, &y, &coord_type))
3303 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 3303 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
3304 3304
3305 Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; 3305 Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
3306 contains = elm_interface_atspi_component_contains(obj, type, x, y); 3306 contains = efl_access_component_contains(obj, type, x, y);
3307 3307
3308 ret = eldbus_message_method_return_new(msg); 3308 ret = eldbus_message_method_return_new(msg);
3309 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 3309 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3325,7 +3325,7 @@ _component_get_accessible_at_point(const Eldbus_Service_Interface *iface EINA_UN
3325 Eldbus_Message *ret; 3325 Eldbus_Message *ret;
3326 Eldbus_Message_Iter *iter; 3326 Eldbus_Message_Iter *iter;
3327 3327
3328 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); 3328 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg);
3329 3329
3330 if (!eldbus_message_arguments_get(msg, "iiu", &x, &y, &coord_type)) 3330 if (!eldbus_message_arguments_get(msg, "iiu", &x, &y, &coord_type))
3331 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 3331 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -3335,7 +3335,7 @@ _component_get_accessible_at_point(const Eldbus_Service_Interface *iface EINA_UN
3335 3335
3336 iter = eldbus_message_iter_get(ret); 3336 iter = eldbus_message_iter_get(ret);
3337 Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; 3337 Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
3338 accessible = elm_interface_atspi_component_accessible_at_point_get(obj, type, x, y); 3338 accessible = efl_access_component_accessible_at_point_get(obj, type, x, y);
3339 _bridge_iter_object_reference_append(bridge, iter, accessible); 3339 _bridge_iter_object_reference_append(bridge, iter, accessible);
3340 _bridge_object_register(bridge, accessible); 3340 _bridge_object_register(bridge, accessible);
3341 3341
@@ -3353,7 +3353,7 @@ _component_get_extents(const Eldbus_Service_Interface *iface EINA_UNUSED, const
3353 Eldbus_Message *ret; 3353 Eldbus_Message *ret;
3354 Eldbus_Message_Iter *iter, *iter_struct; 3354 Eldbus_Message_Iter *iter, *iter_struct;
3355 3355
3356 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); 3356 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg);
3357 3357
3358 if (!eldbus_message_arguments_get(msg, "u", &coord_type)) 3358 if (!eldbus_message_arguments_get(msg, "u", &coord_type))
3359 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 3359 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -3364,7 +3364,7 @@ _component_get_extents(const Eldbus_Service_Interface *iface EINA_UNUSED, const
3364 iter = eldbus_message_iter_get(ret); 3364 iter = eldbus_message_iter_get(ret);
3365 3365
3366 Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; 3366 Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
3367 elm_interface_atspi_component_extents_get(obj, type, &x, &y, &w, &h); 3367 efl_access_component_extents_get(obj, type, &x, &y, &w, &h);
3368 iter_struct = eldbus_message_iter_container_new(iter, 'r', NULL); 3368 iter_struct = eldbus_message_iter_container_new(iter, 'r', NULL);
3369 EINA_SAFETY_ON_NULL_GOTO(iter_struct, fail); 3369 EINA_SAFETY_ON_NULL_GOTO(iter_struct, fail);
3370 3370
@@ -3391,13 +3391,13 @@ _component_get_position(const Eldbus_Service_Interface *iface EINA_UNUSED, const
3391 AtspiCoordType coord_type; 3391 AtspiCoordType coord_type;
3392 Eldbus_Message *ret; 3392 Eldbus_Message *ret;
3393 3393
3394 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); 3394 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg);
3395 3395
3396 if (!eldbus_message_arguments_get(msg, "u", &coord_type)) 3396 if (!eldbus_message_arguments_get(msg, "u", &coord_type))
3397 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 3397 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
3398 3398
3399 Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; 3399 Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
3400 elm_interface_atspi_component_position_get(obj, type, &x, &y); 3400 efl_access_component_position_get(obj, type, &x, &y);
3401 3401
3402 ret = eldbus_message_method_return_new(msg); 3402 ret = eldbus_message_method_return_new(msg);
3403 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 3403 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3417,9 +3417,9 @@ _component_get_size(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eld
3417 int x, y; 3417 int x, y;
3418 Eldbus_Message *ret; 3418 Eldbus_Message *ret;
3419 3419
3420 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); 3420 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg);
3421 3421
3422 elm_interface_atspi_component_size_get(obj, &x, &y); 3422 efl_access_component_size_get(obj, &x, &y);
3423 3423
3424 ret = eldbus_message_method_return_new(msg); 3424 ret = eldbus_message_method_return_new(msg);
3425 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 3425 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3450,9 +3450,9 @@ _component_get_layer(const Eldbus_Service_Interface *iface EINA_UNUSED, const El
3450 Eldbus_Message *ret; 3450 Eldbus_Message *ret;
3451 AtspiComponentLayer atspi_layer; 3451 AtspiComponentLayer atspi_layer;
3452 3452
3453 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); 3453 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg);
3454 3454
3455 layer = elm_interface_atspi_component_layer_get(obj); 3455 layer = efl_access_component_layer_get(obj);
3456 3456
3457 ret = eldbus_message_method_return_new(msg); 3457 ret = eldbus_message_method_return_new(msg);
3458 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 3458 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3475,7 +3475,7 @@ _component_grab_focus(const Eldbus_Service_Interface *iface EINA_UNUSED, const E
3475 if (!obj) 3475 if (!obj)
3476 return _dbus_invalid_ref_error_new(msg); 3476 return _dbus_invalid_ref_error_new(msg);
3477 3477
3478 focus = elm_interface_atspi_component_focus_grab(obj); 3478 focus = efl_access_component_focus_grab(obj);
3479 3479
3480 ret = eldbus_message_method_return_new(msg); 3480 ret = eldbus_message_method_return_new(msg);
3481 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 3481 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3497,7 +3497,7 @@ _component_get_alpha(const Eldbus_Service_Interface *iface EINA_UNUSED, const El
3497 if (!obj) 3497 if (!obj)
3498 return _dbus_invalid_ref_error_new(msg); 3498 return _dbus_invalid_ref_error_new(msg);
3499 3499
3500 alpha = elm_interface_atspi_component_alpha_get(obj); 3500 alpha = efl_access_component_alpha_get(obj);
3501 3501
3502 ret = eldbus_message_method_return_new(msg); 3502 ret = eldbus_message_method_return_new(msg);
3503 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 3503 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3518,13 +3518,13 @@ _component_set_extends(const Eldbus_Service_Interface *iface EINA_UNUSED, const
3518 Eldbus_Message *ret; 3518 Eldbus_Message *ret;
3519 Eina_Bool result = EINA_FALSE; 3519 Eina_Bool result = EINA_FALSE;
3520 3520
3521 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); 3521 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg);
3522 3522
3523 if (!eldbus_message_arguments_get(msg, "iiiiu", &x, &y, &w, &h, &coord_type)) 3523 if (!eldbus_message_arguments_get(msg, "iiiiu", &x, &y, &w, &h, &coord_type))
3524 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 3524 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
3525 3525
3526 Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; 3526 Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
3527 result = elm_interface_atspi_component_extents_set(obj, type, x, y, w, h); 3527 result = efl_access_component_extents_set(obj, type, x, y, w, h);
3528 3528
3529 ret = eldbus_message_method_return_new(msg); 3529 ret = eldbus_message_method_return_new(msg);
3530 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 3530 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3545,13 +3545,13 @@ _component_set_position(const Eldbus_Service_Interface *iface EINA_UNUSED, const
3545 AtspiCoordType coord_type; 3545 AtspiCoordType coord_type;
3546 Eldbus_Message *ret; 3546 Eldbus_Message *ret;
3547 3547
3548 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); 3548 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg);
3549 3549
3550 if (!eldbus_message_arguments_get(msg, "iiu", &x, &y, &coord_type)) 3550 if (!eldbus_message_arguments_get(msg, "iiu", &x, &y, &coord_type))
3551 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 3551 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
3552 3552
3553 Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE; 3553 Eina_Bool type = coord_type == ATSPI_COORD_TYPE_SCREEN ? EINA_TRUE : EINA_FALSE;
3554 result = elm_interface_atspi_component_position_set(obj, type, x, y); 3554 result = efl_access_component_position_set(obj, type, x, y);
3555 3555
3556 ret = eldbus_message_method_return_new(msg); 3556 ret = eldbus_message_method_return_new(msg);
3557 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 3557 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -3571,12 +3571,12 @@ _component_set_size(const Eldbus_Service_Interface *iface EINA_UNUSED, const Eld
3571 Eina_Bool result; 3571 Eina_Bool result;
3572 Eldbus_Message *ret; 3572 Eldbus_Message *ret;
3573 3573
3574 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, ELM_INTERFACE_ATSPI_COMPONENT_MIXIN, msg); 3574 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_COMPONENT_MIXIN, msg);
3575 3575
3576 if (!eldbus_message_arguments_get(msg, "ii", &w, &h)) 3576 if (!eldbus_message_arguments_get(msg, "ii", &w, &h))
3577 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 3577 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
3578 3578
3579 result = elm_interface_atspi_component_size_set(obj, w, h); 3579 result = efl_access_component_size_set(obj, w, h);
3580 3580
3581 ret = eldbus_message_method_return_new(msg); 3581 ret = eldbus_message_method_return_new(msg);
3582 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 3582 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index b7f6419b99..75ac9c5cc9 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED 6#define EFL_ACCESS_COMPONENT_PROTECTED
7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 7#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
8 8
9#include <Elementary.h> 9#include <Elementary.h>
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index d21f3b5e5f..7365647254 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -4,7 +4,7 @@
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED 6#define ELM_INTERFACE_ATSPI_WIDGET_ACTION_PROTECTED
7#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED 7#define EFL_ACCESS_COMPONENT_PROTECTED
8#define ELM_WIDGET_ITEM_PROTECTED 8#define ELM_WIDGET_ITEM_PROTECTED
9 9
10#include <Elementary.h> 10#include <Elementary.h>
diff --git a/src/lib/elementary/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h
index bd3623278b..bc5ffdc118 100644
--- a/src/lib/elementary/elm_interfaces.h
+++ b/src/lib/elementary/elm_interfaces.h
@@ -7,7 +7,7 @@
7#include "elm_interface_scrollable.h" 7#include "elm_interface_scrollable.h"
8#ifdef EFL_BETA_API_SUPPORT 8#ifdef EFL_BETA_API_SUPPORT
9#include "elm_interface_atspi_action.eo.h" 9#include "elm_interface_atspi_action.eo.h"
10#include "elm_interface_atspi_component.eo.h" 10#include "efl_access_component.eo.h"
11#include "elm_interface_atspi_text_editable.eo.h" 11#include "elm_interface_atspi_text_editable.eo.h"
12#include "efl_access_image.eo.h" 12#include "efl_access_image.eo.h"
13#include "elm_interface_atspi_selection.eo.h" 13#include "elm_interface_atspi_selection.eo.h"
@@ -17,7 +17,7 @@
17#ifndef EFL_NOLEGACY_API_SUPPORT 17#ifndef EFL_NOLEGACY_API_SUPPORT
18#ifdef EFL_BETA_API_SUPPORT 18#ifdef EFL_BETA_API_SUPPORT
19#include "elm_interface_atspi_action.eo.legacy.h" 19#include "elm_interface_atspi_action.eo.legacy.h"
20#include "elm_interface_atspi_component.eo.legacy.h" 20#include "efl_access_component.eo.legacy.h"
21#include "elm_interface_atspi_text_editable.eo.legacy.h" 21#include "elm_interface_atspi_text_editable.eo.legacy.h"
22#include "efl_access_image.eo.legacy.h" 22#include "efl_access_image.eo.legacy.h"
23#include "elm_interface_atspi_selection.eo.legacy.h" 23#include "elm_interface_atspi_selection.eo.legacy.h"
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index f1f0fb217b..d4983199f7 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -3,7 +3,7 @@
3#endif 3#endif
4 4
5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED 5#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
6#define ELM_INTERFACE_ATSPI_COMPONENT_PROTECTED 6#define EFL_ACCESS_COMPONENT_PROTECTED
7#define ELM_WIDGET_PROTECTED 7#define ELM_WIDGET_PROTECTED
8#define ELM_WIDGET_ITEM_PROTECTED 8#define ELM_WIDGET_ITEM_PROTECTED
9#define EFL_CANVAS_OBJECT_BETA 9#define EFL_CANVAS_OBJECT_BETA
@@ -6313,7 +6313,7 @@ _elm_widget_class_constructor(Efl_Class *klass)
6313} 6313}
6314 6314
6315EOLIAN static Eina_Bool 6315EOLIAN static Eina_Bool
6316_elm_widget_elm_interface_atspi_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED) 6316_elm_widget_efl_access_component_focus_grab(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
6317{ 6317{
6318 if (elm_object_focus_allow_get(obj)) 6318 if (elm_object_focus_allow_get(obj))
6319 { 6319 {
@@ -6424,7 +6424,7 @@ _elm_widget_elm_interface_atspi_accessible_attributes_get(Eo *obj, Elm_Widget_Sm
6424} 6424}
6425 6425
6426EOLIAN static void 6426EOLIAN static void
6427_elm_widget_item_elm_interface_atspi_component_extents_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h) 6427_elm_widget_item_efl_access_component_extents_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED, Eina_Bool screen_coords, int *x, int *y, int *w, int *h)
6428{ 6428{
6429 int ee_x, ee_y; 6429 int ee_x, ee_y;
6430 6430
@@ -6449,13 +6449,13 @@ _elm_widget_item_elm_interface_atspi_component_extents_get(Eo *obj EINA_UNUSED,
6449} 6449}
6450 6450
6451EOLIAN static Eina_Bool 6451EOLIAN static Eina_Bool
6452_elm_widget_item_elm_interface_atspi_component_extents_set(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED, Eina_Bool screen_coords EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED) 6452_elm_widget_item_efl_access_component_extents_set(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED, Eina_Bool screen_coords EINA_UNUSED, int x EINA_UNUSED, int y EINA_UNUSED, int w EINA_UNUSED, int h EINA_UNUSED)
6453{ 6453{
6454 return EINA_FALSE; 6454 return EINA_FALSE;
6455} 6455}
6456 6456
6457EOLIAN static int 6457EOLIAN static int
6458_elm_widget_item_elm_interface_atspi_component_layer_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED) 6458_elm_widget_item_efl_access_component_layer_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED)
6459{ 6459{
6460 if (!sd->view) 6460 if (!sd->view)
6461 return -1; 6461 return -1;
@@ -6463,14 +6463,14 @@ _elm_widget_item_elm_interface_atspi_component_layer_get(Eo *obj EINA_UNUSED, El
6463} 6463}
6464 6464
6465EOLIAN static Eina_Bool 6465EOLIAN static Eina_Bool
6466_elm_widget_item_elm_interface_atspi_component_focus_grab(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *_pd EINA_UNUSED) 6466_elm_widget_item_efl_access_component_focus_grab(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *_pd EINA_UNUSED)
6467{ 6467{
6468 elm_object_item_focus_set(obj, EINA_TRUE); 6468 elm_object_item_focus_set(obj, EINA_TRUE);
6469 return elm_object_item_focus_get(obj); 6469 return elm_object_item_focus_get(obj);
6470} 6470}
6471 6471
6472EOLIAN static double 6472EOLIAN static double
6473_elm_widget_item_elm_interface_atspi_component_alpha_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED) 6473_elm_widget_item_efl_access_component_alpha_get(Eo *obj EINA_UNUSED, Elm_Widget_Item_Data *sd EINA_UNUSED)
6474{ 6474{
6475 int alpha; 6475 int alpha;
6476 6476
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 89d622f159..c351fed386 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -18,7 +18,7 @@ struct Elm.Widget.Focus_State {
18} 18}
19 19
20abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible, 20abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
21 Elm.Interface.Atspi_Component, Efl.Ui.Focus.User, 21 Efl.Access.Component, Efl.Ui.Focus.User,
22 Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor) 22 Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor)
23{ 23{
24 [[Elementary widget abstract class]] 24 [[Elementary widget abstract class]]
@@ -857,7 +857,7 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
857 Elm.Interface.Atspi_Accessible.children { get; } 857 Elm.Interface.Atspi_Accessible.children { get; }
858 Elm.Interface.Atspi_Accessible.parent { get; } 858 Elm.Interface.Atspi_Accessible.parent { get; }
859 Elm.Interface.Atspi_Accessible.attributes { get; } 859 Elm.Interface.Atspi_Accessible.attributes { get; }
860 Elm.Interface.Atspi_Component.focus_grab; 860 Efl.Access.Component.focus_grab;
861 Efl.Ui.Focus.User.manager { get; } 861 Efl.Ui.Focus.User.manager { get; }
862 Efl.Ui.Focus.User.parent { get; } 862 Efl.Ui.Focus.User.parent { get; }
863 Efl.Ui.Focus.Object.focus_geometry { get; } 863 Efl.Ui.Focus.Object.focus_geometry { get; }
diff --git a/src/lib/elementary/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo
index dac05ea4cd..822a4e5a01 100644
--- a/src/lib/elementary/elm_widget_item.eo
+++ b/src/lib/elementary/elm_widget_item.eo
@@ -1,7 +1,7 @@
1import elm_general; 1import elm_general;
2 2
3class Elm.Widget.Item(Efl.Object, Elm.Interface.Atspi_Accessible, 3class Elm.Widget.Item(Efl.Object, Elm.Interface.Atspi_Accessible,
4 Elm.Interface.Atspi_Component) 4 Efl.Access.Component)
5{ 5{
6 [[Elementary widget item class]] 6 [[Elementary widget item class]]
7 eo_prefix: elm_wdg_item; 7 eo_prefix: elm_wdg_item;
@@ -537,9 +537,9 @@ class Elm.Widget.Item(Efl.Object, Elm.Interface.Atspi_Accessible,
537 Efl.Object.constructor; 537 Efl.Object.constructor;
538 Efl.Object.destructor; 538 Efl.Object.destructor;
539 Elm.Interface.Atspi_Accessible.state_set { get; } 539 Elm.Interface.Atspi_Accessible.state_set { get; }
540 Elm.Interface.Atspi_Component.extents { get; set; } 540 Efl.Access.Component.extents { get; set; }
541 Elm.Interface.Atspi_Component.alpha { get; } 541 Efl.Access.Component.alpha { get; }
542 Elm.Interface.Atspi_Component.layer { get; } 542 Efl.Access.Component.layer { get; }
543 Elm.Interface.Atspi_Component.focus_grab; 543 Efl.Access.Component.focus_grab;
544 } 544 }
545} 545}