summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-06-10 17:58:17 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-06-10 18:06:15 +0900
commitb2355d7da3f9919b4227e803a90b4f68c4230201 (patch)
tree2e99d0bef706fb1cc6e4735427dab2641a49f10c /src
parent31c4fd1f7c8e9731e9c36903a79db754d94060ee (diff)
Evas: Rename Selectable_Interface to Efl.Ui.Selectable
Diffstat (limited to '')
-rw-r--r--src/Makefile_Evas.am2
-rw-r--r--src/lib/elementary/elc_fileselector.c16
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c12
-rw-r--r--src/lib/elementary/elc_hoversel.c2
-rw-r--r--src/lib/elementary/elm_actionslider.c12
-rw-r--r--src/lib/elementary/elm_actionslider.eo2
-rw-r--r--src/lib/elementary/elm_color_class.c2
-rw-r--r--src/lib/elementary/elm_combobox.eo2
-rw-r--r--src/lib/elementary/elm_diskselector.c2
-rw-r--r--src/lib/elementary/elm_diskselector.eo2
-rw-r--r--src/lib/elementary/elm_entry.c16
-rw-r--r--src/lib/elementary/elm_entry.eo2
-rw-r--r--src/lib/elementary/elm_fileselector.eo2
-rw-r--r--src/lib/elementary/elm_fileselector_entry.eo2
-rw-r--r--src/lib/elementary/elm_flipselector.c2
-rw-r--r--src/lib/elementary/elm_flipselector.eo2
-rw-r--r--src/lib/elementary/elm_gengrid.c4
-rw-r--r--src/lib/elementary/elm_genlist.c4
-rw-r--r--src/lib/elementary/elm_genlist.eo2
-rw-r--r--src/lib/elementary/elm_hoversel.eo2
-rw-r--r--src/lib/elementary/elm_index.c4
-rw-r--r--src/lib/elementary/elm_index.eo2
-rw-r--r--src/lib/elementary/elm_list.c4
-rw-r--r--src/lib/elementary/elm_list.eo2
-rw-r--r--src/lib/elementary/elm_toolbar.c4
-rw-r--r--src/lib/elementary/elm_toolbar.eo2
-rw-r--r--src/lib/evas/Evas_Eo.h2
-rw-r--r--src/lib/evas/canvas/common_interfaces.c2
-rw-r--r--src/lib/evas/canvas/efl_ui_selectable.eo (renamed from src/lib/evas/canvas/evas_selectable_interface.eo)3
29 files changed, 59 insertions, 58 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index e01728b344..263bc48b93 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -13,7 +13,7 @@ evas_eolian_pub_files = \
13 lib/evas/canvas/efl_ui_draggable.eo \ 13 lib/evas/canvas/efl_ui_draggable.eo \
14 lib/evas/canvas/efl_ui_clickable.eo \ 14 lib/evas/canvas/efl_ui_clickable.eo \
15 lib/evas/canvas/efl_ui_scrollable.eo \ 15 lib/evas/canvas/efl_ui_scrollable.eo \
16 lib/evas/canvas/evas_selectable_interface.eo \ 16 lib/evas/canvas/efl_ui_selectable.eo \
17 lib/evas/canvas/evas_zoomable_interface.eo \ 17 lib/evas/canvas/evas_zoomable_interface.eo \
18 lib/evas/canvas/evas_canvas3d_camera.eo\ 18 lib/evas/canvas/evas_canvas3d_camera.eo\
19 lib/evas/canvas/evas_canvas3d_texture.eo\ 19 lib/evas/canvas/evas_canvas3d_texture.eo\
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 1a088a014e..9e9e4eca87 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1129,7 +1129,7 @@ _on_item_selected(void *data, const Eo_Event *event)
1129 1129
1130 // EVENTS: should not call legacy 1130 // EVENTS: should not call legacy
1131 //eo_event_callback_call 1131 //eo_event_callback_call
1132 // (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)it_data->model); 1132 // (data, EFL_UI_EVENT_SELECTED, (void *)it_data->model);
1133 evas_object_smart_callback_call(data, "selected", (void *)it_data->path); 1133 evas_object_smart_callback_call(data, "selected", (void *)it_data->path);
1134 } 1134 }
1135 else if (sd->multi && it_data->is_dir && sd->double_tap_navigation) 1135 else if (sd->multi && it_data->is_dir && sd->double_tap_navigation)
@@ -1371,7 +1371,7 @@ _text_activated_is_dir_then(void *data, void *value)
1371 { 1371 {
1372 // EVENTS: should not call legacy 1372 // EVENTS: should not call legacy
1373 //eo_event_callback_call 1373 //eo_event_callback_call
1374 // (fs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)model); 1374 // (fs, EFL_UI_EVENT_SELECTED, (void *)model);
1375 evas_object_smart_callback_call(fs, "selected", (void *) str); 1375 evas_object_smart_callback_call(fs, "selected", (void *) str);
1376 } 1376 }
1377 } 1377 }
@@ -1390,7 +1390,7 @@ _text_activated_is_dir_then(void *data, void *value)
1390 { 1390 {
1391 // EVENTS: should not call legacy 1391 // EVENTS: should not call legacy
1392 //eo_event_callback_call 1392 //eo_event_callback_call
1393 // (fs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)model); 1393 // (fs, EFL_UI_EVENT_SELECTED, (void *)model);
1394 evas_object_smart_callback_call(fs, "selected", (void *) str); 1394 evas_object_smart_callback_call(fs, "selected", (void *) str);
1395 } 1395 }
1396 } 1396 }
@@ -1429,7 +1429,7 @@ _on_text_activated_set_path_then_error(void *data, Eina_Error err EINA_UNUSED)
1429 1429
1430 // EVENTS: should not call legacy 1430 // EVENTS: should not call legacy
1431 //eo_event_callback_call 1431 //eo_event_callback_call
1432 // (fs, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (void *)model); 1432 // (fs, EFL_UI_EVENT_SELECTED, (void *)model);
1433 evas_object_smart_callback_call(fs, "selected", (void *)str); 1433 evas_object_smart_callback_call(fs, "selected", (void *)str);
1434 1434
1435 // EVENTS: should not call legacy 1435 // EVENTS: should not call legacy
@@ -1586,9 +1586,9 @@ _files_list_add(Evas_Object *obj)
1586 elm_widget_mirrored_automatic_set(li, EINA_FALSE); 1586 elm_widget_mirrored_automatic_set(li, EINA_FALSE);
1587 1587
1588 eo_event_callback_add 1588 eo_event_callback_add
1589 (li, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _on_item_selected, obj); 1589 (li, EFL_UI_EVENT_SELECTED, _on_item_selected, obj);
1590 eo_event_callback_add 1590 eo_event_callback_add
1591 (li, EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, _on_item_unselected, obj); 1591 (li, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj);
1592 eo_event_callback_add 1592 eo_event_callback_add
1593 (li, ELM_GENLIST_EVENT_ACTIVATED, _on_item_activated, obj); 1593 (li, ELM_GENLIST_EVENT_ACTIVATED, _on_item_activated, obj);
1594 eo_event_callback_add 1594 eo_event_callback_add
@@ -1623,9 +1623,9 @@ _files_grid_add(Evas_Object *obj)
1623 elm_gengrid_align_set(grid, 0.0, 0.0); 1623 elm_gengrid_align_set(grid, 0.0, 0.0);
1624 1624
1625 eo_event_callback_add 1625 eo_event_callback_add
1626 (grid, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _on_item_selected, obj); 1626 (grid, EFL_UI_EVENT_SELECTED, _on_item_selected, obj);
1627 eo_event_callback_add 1627 eo_event_callback_add
1628 (grid, EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, _on_item_unselected, obj); 1628 (grid, EFL_UI_EVENT_UNSELECTED, _on_item_unselected, obj);
1629 eo_event_callback_add 1629 eo_event_callback_add
1630 (grid, ELM_GENGRID_EVENT_ACTIVATED, _on_item_activated, obj); 1630 (grid, ELM_GENGRID_EVENT_ACTIVATED, _on_item_activated, obj);
1631 eo_event_callback_add 1631 eo_event_callback_add
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 6d680635fb..c5201f3726 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -60,9 +60,9 @@ SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED)
60SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE) 60SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE)
61SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED) 61SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED)
62SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED) 62SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED)
63SIG_FWD(SELECTION_PASTE, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE) 63SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE)
64SIG_FWD(SELECTION_COPY, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY) 64SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY)
65SIG_FWD(SELECTION_CUT, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT) 65SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT)
66SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED) 66SIG_FWD(UNPRESSED, EFL_UI_EVENT_UNPRESSED)
67#undef SIG_FWD 67#undef SIG_FWD
68 68
@@ -357,9 +357,9 @@ _elm_fileselector_entry_evas_object_smart_add(Eo *obj, Elm_Fileselector_Entry_Da
357 SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE); 357 SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE);
358 SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED); 358 SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED);
359 SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED); 359 SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED);
360 SIG_FWD(SELECTION_PASTE, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE); 360 SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE);
361 SIG_FWD(SELECTION_COPY, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY); 361 SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY);
362 SIG_FWD(SELECTION_CUT, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT); 362 SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT);
363#undef SIG_FWD 363#undef SIG_FWD
364 364
365 if (!elm_layout_theme_set 365 if (!elm_layout_theme_set
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 8e851c189d..be4a2da58f 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -163,7 +163,7 @@ _on_item_clicked(void *data EINA_UNUSED, const Eo_Event *event EINA_UNUSED)
163 ELM_HOVERSEL_DATA_GET(obj2, sd); 163 ELM_HOVERSEL_DATA_GET(obj2, sd);
164 164
165 if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it); 165 if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it);
166 eo_event_callback_call(obj2, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it); 166 eo_event_callback_call(obj2, EFL_UI_EVENT_SELECTED, eo_it);
167 167
168 evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item); 168 evas_object_event_callback_add(sd->hover, EVAS_CALLBACK_DEL, _auto_update, item);
169 169
diff --git a/src/lib/elementary/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c
index 583b76700b..6d0c3cef2e 100644
--- a/src/lib/elementary/elm_actionslider.c
+++ b/src/lib/elementary/elm_actionslider.c
@@ -233,15 +233,15 @@ _button_animator(void *data)
233 if ((!sd->final_position) && 233 if ((!sd->final_position) &&
234 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT)) 234 (sd->enabled_position & ELM_ACTIONSLIDER_LEFT))
235 eo_event_callback_call 235 eo_event_callback_call
236 (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)left); 236 (obj, EFL_UI_EVENT_SELECTED, (char *)left);
237 else if ((sd->final_position == 0.5) && 237 else if ((sd->final_position == 0.5) &&
238 (sd->enabled_position & ELM_ACTIONSLIDER_CENTER)) 238 (sd->enabled_position & ELM_ACTIONSLIDER_CENTER))
239 eo_event_callback_call 239 eo_event_callback_call
240 (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)center); 240 (obj, EFL_UI_EVENT_SELECTED, (char *)center);
241 else if ((sd->final_position == 1) && 241 else if ((sd->final_position == 1) &&
242 (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT)) 242 (sd->enabled_position & ELM_ACTIONSLIDER_RIGHT))
243 eo_event_callback_call 243 eo_event_callback_call
244 (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)right); 244 (obj, EFL_UI_EVENT_SELECTED, (char *)right);
245 245
246 sd->button_animator = NULL; 246 sd->button_animator = NULL;
247 247
@@ -279,7 +279,7 @@ _drag_button_up_cb(void *data,
279 { 279 {
280 sd->final_position = 0; 280 sd->final_position = 0;
281 eo_event_callback_call 281 eo_event_callback_call
282 (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)left); 282 (obj, EFL_UI_EVENT_SELECTED, (char *)left);
283 283
284 return; 284 return;
285 } 285 }
@@ -289,7 +289,7 @@ _drag_button_up_cb(void *data,
289 { 289 {
290 sd->final_position = 0.5; 290 sd->final_position = 0.5;
291 eo_event_callback_call 291 eo_event_callback_call
292 (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)center); 292 (obj, EFL_UI_EVENT_SELECTED, (char *)center);
293 293
294 ecore_animator_del(sd->button_animator); 294 ecore_animator_del(sd->button_animator);
295 sd->button_animator = ecore_animator_add(_button_animator, obj); 295 sd->button_animator = ecore_animator_add(_button_animator, obj);
@@ -303,7 +303,7 @@ _drag_button_up_cb(void *data,
303 { 303 {
304 sd->final_position = 1; 304 sd->final_position = 1;
305 eo_event_callback_call 305 eo_event_callback_call
306 (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, (char *)right); 306 (obj, EFL_UI_EVENT_SELECTED, (char *)right);
307 return; 307 return;
308 } 308 }
309 309
diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo
index acb32cd4f1..3683fbf982 100644
--- a/src/lib/elementary/elm_actionslider.eo
+++ b/src/lib/elementary/elm_actionslider.eo
@@ -10,7 +10,7 @@ enum Elm.Actionslider.Pos
10 all = (1 << 3) - 1 [[All positions for left/center/right.]] 10 all = (1 << 3) - 1 [[All positions for left/center/right.]]
11} 11}
12 12
13class Elm.Actionslider (Elm.Layout, Evas.Selectable_Interface) 13class Elm.Actionslider (Elm.Layout, Efl.Ui.Selectable)
14{ 14{
15 [[An actionslider is a switcher for 2 or 3 labels 15 [[An actionslider is a switcher for 2 or 3 labels
16 16
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index b49dcab348..02c2d25b1b 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -736,7 +736,7 @@ elm_color_class_editor_add(Evas_Object *obj)
736 elm_genlist_mode_set(gl, ELM_LIST_COMPRESS); 736 elm_genlist_mode_set(gl, ELM_LIST_COMPRESS);
737 elm_object_part_content_set(ly, "elm.swallow.list", gl); 737 elm_object_part_content_set(ly, "elm.swallow.list", gl);
738 eo_event_callback_add 738 eo_event_callback_add
739 (gl, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, _colorclass_activate, cc); 739 (gl, EFL_UI_EVENT_SELECTED, _colorclass_activate, cc);
740 740
741 cc->reset = bt = elm_button_add(ly); 741 cc->reset = bt = elm_button_add(ly);
742 elm_object_style_set(bt, "colorclass"); 742 elm_object_style_set(bt, "colorclass");
diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo
index 89ec590662..24679c844f 100644
--- a/src/lib/elementary/elm_combobox.eo
+++ b/src/lib/elementary/elm_combobox.eo
@@ -1,4 +1,4 @@
1class Elm.Combobox (Elm.Button, Evas.Selectable_Interface, 1class Elm.Combobox (Elm.Button, Efl.Ui.Selectable,
2 Elm.Interface.Atspi_Widget_Action, 2 Elm.Interface.Atspi_Widget_Action,
3 Elm.Entry, Elm.Genlist, Elm.Hover, Elm.Multibuttonentry) 3 Elm.Entry, Elm.Genlist, Elm.Hover, Elm.Multibuttonentry)
4{ 4{
diff --git a/src/lib/elementary/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c
index f89beda60f..e9944d189c 100644
--- a/src/lib/elementary/elm_diskselector.c
+++ b/src/lib/elementary/elm_diskselector.c
@@ -90,7 +90,7 @@ _item_select(Elm_Diskselector_Item_Data *it)
90 90
91 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); 91 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
92 eo_event_callback_call 92 eo_event_callback_call
93 (WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it); 93 (WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
94} 94}
95 95
96static int 96static int
diff --git a/src/lib/elementary/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo
index a72665dcfe..f2da9db71a 100644
--- a/src/lib/elementary/elm_diskselector.eo
+++ b/src/lib/elementary/elm_diskselector.eo
@@ -1,7 +1,7 @@
1class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable, 1class Elm.Diskselector (Elm.Widget, Elm.Interface_Scrollable,
2 Elm.Interface.Atspi_Widget_Action, 2 Elm.Interface.Atspi_Widget_Action,
3 Efl.Ui.Clickable, Efl.Ui.Scrollable, 3 Efl.Ui.Clickable, Efl.Ui.Scrollable,
4 Evas.Selectable_Interface) 4 Efl.Ui.Selectable)
5{ 5{
6 legacy_prefix: elm_diskselector; 6 legacy_prefix: elm_diskselector;
7 eo_prefix: elm_obj_diskselector; 7 eo_prefix: elm_obj_diskselector;
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 6c7a2d721e..081f4c866e 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1500,7 +1500,7 @@ _paste_cb(void *data,
1500 ELM_ENTRY_DATA_GET(data, sd); 1500 ELM_ENTRY_DATA_GET(data, sd);
1501 1501
1502 eo_event_callback_call 1502 eo_event_callback_call
1503 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE, NULL); 1503 (data, EFL_UI_EVENT_SELECTION_PASTE, NULL);
1504 1504
1505 sd->selection_asked = EINA_TRUE; 1505 sd->selection_asked = EINA_TRUE;
1506 1506
@@ -1552,7 +1552,7 @@ _cut_cb(void *data,
1552 ELM_ENTRY_DATA_GET(data, sd); 1552 ELM_ENTRY_DATA_GET(data, sd);
1553 1553
1554 eo_event_callback_call 1554 eo_event_callback_call
1555 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CUT, NULL); 1555 (data, EFL_UI_EVENT_SELECTION_CUT, NULL);
1556 /* Store it */ 1556 /* Store it */
1557 sd->sel_mode = EINA_FALSE; 1557 sd->sel_mode = EINA_FALSE;
1558 if (!_elm_config->desktop_entry) 1558 if (!_elm_config->desktop_entry)
@@ -1575,7 +1575,7 @@ _copy_cb(void *data,
1575 ELM_ENTRY_DATA_GET(data, sd); 1575 ELM_ENTRY_DATA_GET(data, sd);
1576 1576
1577 eo_event_callback_call 1577 eo_event_callback_call
1578 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_COPY, NULL); 1578 (data, EFL_UI_EVENT_SELECTION_COPY, NULL);
1579 sd->sel_mode = EINA_FALSE; 1579 sd->sel_mode = EINA_FALSE;
1580 if (!_elm_config->desktop_entry) 1580 if (!_elm_config->desktop_entry)
1581 { 1581 {
@@ -2217,7 +2217,7 @@ _entry_selection_start_signal_cb(void *data,
2217 if (entry != data) elm_entry_select_none(entry); 2217 if (entry != data) elm_entry_select_none(entry);
2218 } 2218 }
2219 eo_event_callback_call 2219 eo_event_callback_call
2220 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_START, NULL); 2220 (data, EFL_UI_EVENT_SELECTION_START, NULL);
2221 2221
2222 elm_object_focus_set(data, EINA_TRUE); 2222 elm_object_focus_set(data, EINA_TRUE);
2223} 2223}
@@ -2250,7 +2250,7 @@ _entry_selection_changed_signal_cb(void *data,
2250 2250
2251 sd->have_selection = EINA_TRUE; 2251 sd->have_selection = EINA_TRUE;
2252 eo_event_callback_call 2252 eo_event_callback_call
2253 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CHANGED, NULL); 2253 (data, EFL_UI_EVENT_SELECTION_CHANGED, NULL);
2254 _selection_store(ELM_SEL_TYPE_PRIMARY, data); 2254 _selection_store(ELM_SEL_TYPE_PRIMARY, data);
2255 _update_selection_handler(data); 2255 _update_selection_handler(data);
2256 if (_elm_config->atspi_mode) 2256 if (_elm_config->atspi_mode)
@@ -2269,7 +2269,7 @@ _entry_selection_cleared_signal_cb(void *data,
2269 2269
2270 sd->have_selection = EINA_FALSE; 2270 sd->have_selection = EINA_FALSE;
2271 eo_event_callback_call 2271 eo_event_callback_call
2272 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CLEARED, NULL); 2272 (data, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
2273 if (sd->cut_sel) 2273 if (sd->cut_sel)
2274 { 2274 {
2275 elm_cnp_selection_set 2275 elm_cnp_selection_set
@@ -2301,7 +2301,7 @@ _entry_paste_request_signal_cb(void *data,
2301 2301
2302 if (!sd->editable) return; 2302 if (!sd->editable) return;
2303 eo_event_callback_call 2303 eo_event_callback_call
2304 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_PASTE, NULL); 2304 (data, EFL_UI_EVENT_SELECTION_PASTE, NULL);
2305 2305
2306 top = elm_widget_top_get(data); 2306 top = elm_widget_top_get(data);
2307 if ((top) && (elm_win_window_id_get(top))) 2307 if ((top) && (elm_win_window_id_get(top)))
@@ -4209,7 +4209,7 @@ _elm_entry_select_none(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
4209 } 4209 }
4210 if (sd->have_selection) 4210 if (sd->have_selection)
4211 eo_event_callback_call 4211 eo_event_callback_call
4212 (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTION_CLEARED, NULL); 4212 (obj, EFL_UI_EVENT_SELECTION_CLEARED, NULL);
4213 4213
4214 sd->have_selection = EINA_FALSE; 4214 sd->have_selection = EINA_FALSE;
4215 edje_object_part_text_select_none(sd->entry_edje, "elm.text"); 4215 edje_object_part_text_select_none(sd->entry_edje, "elm.text");
diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo
index a291cae119..bf6ce86afe 100644
--- a/src/lib/elementary/elm_entry.eo
+++ b/src/lib/elementary/elm_entry.eo
@@ -116,7 +116,7 @@ enum Elm.Cnp_Mode
116 116
117class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, 117class Elm.Entry (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
118 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File, 118 Elm.Interface.Atspi.Text, Elm.Interface.Atspi.Text.Editable, Efl.File,
119 Evas.Selectable_Interface, Efl.Ui.Scrollable) 119 Efl.Ui.Selectable, Efl.Ui.Scrollable)
120{ 120{
121 legacy_prefix: elm_entry; 121 legacy_prefix: elm_entry;
122 eo_prefix: elm_obj_entry; 122 eo_prefix: elm_obj_entry;
diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo
index c668148ba5..186dab3e08 100644
--- a/src/lib/elementary/elm_fileselector.eo
+++ b/src/lib/elementary/elm_fileselector.eo
@@ -1,6 +1,6 @@
1class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector, 1class Elm.Fileselector (Elm.Layout, Elm.Interface.Fileselector,
2 Elm.Interface.Atspi_Widget_Action, 2 Elm.Interface.Atspi_Widget_Action,
3 Efl.Ui.Clickable, Evas.Selectable_Interface) 3 Efl.Ui.Clickable, Efl.Ui.Selectable)
4{ 4{
5 legacy_prefix: elm_fileselector; 5 legacy_prefix: elm_fileselector;
6 eo_prefix: elm_obj_fileselector; 6 eo_prefix: elm_obj_fileselector;
diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo
index 4f61088d6b..30841a205e 100644
--- a/src/lib/elementary/elm_fileselector_entry.eo
+++ b/src/lib/elementary/elm_fileselector_entry.eo
@@ -1,5 +1,5 @@
1class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector, 1class Elm.Fileselector_Entry (Elm.Layout, Elm.Interface.Fileselector,
2 Efl.Ui.Clickable, Evas.Selectable_Interface) 2 Efl.Ui.Clickable, Efl.Ui.Selectable)
3{ 3{
4 [[Not an EO API.]] 4 [[Not an EO API.]]
5 event_prefix: elm_fileselector_entry; 5 event_prefix: elm_fileselector_entry;
diff --git a/src/lib/elementary/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c
index 90d3caffcb..0eb328847a 100644
--- a/src/lib/elementary/elm_flipselector.c
+++ b/src/lib/elementary/elm_flipselector.c
@@ -231,7 +231,7 @@ _on_item_changed(Elm_Flipselector_Data *sd)
231 if (item->func) 231 if (item->func)
232 item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item); 232 item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item);
233 eo_event_callback_call 233 eo_event_callback_call
234 (sd->obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_item); 234 (sd->obj, EFL_UI_EVENT_SELECTED, eo_item);
235} 235}
236 236
237static void 237static void
diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo
index f0568980e8..23441b96ee 100644
--- a/src/lib/elementary/elm_flipselector.eo
+++ b/src/lib/elementary/elm_flipselector.eo
@@ -1,6 +1,6 @@
1class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin, 1class Elm.Flipselector (Elm.Layout, Efl.Ui.Spin,
2 Elm.Interface.Atspi_Widget_Action, 2 Elm.Interface.Atspi_Widget_Action,
3 Evas.Selectable_Interface) 3 Efl.Ui.Selectable)
4{ 4{
5 legacy_prefix: elm_flipselector; 5 legacy_prefix: elm_flipselector;
6 eo_prefix: elm_obj_flipselector; 6 eo_prefix: elm_obj_flipselector;
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 84e5db946c..f21129bd49 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -513,7 +513,7 @@ _item_unselect(Elm_Gen_Item *it)
513 it->selected = EINA_FALSE; 513 it->selected = EINA_FALSE;
514 sd->selected = eina_list_remove(sd->selected, eo_it); 514 sd->selected = eina_list_remove(sd->selected, eo_it);
515 eo_event_callback_call 515 eo_event_callback_call
516 (WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, eo_it); 516 (WIDGET(it), EFL_UI_EVENT_UNSELECTED, eo_it);
517 if (_elm_config->atspi_mode) 517 if (_elm_config->atspi_mode)
518 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_FALSE); 518 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
519 } 519 }
@@ -4140,7 +4140,7 @@ _item_select(Elm_Gen_Item *it)
4140 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it); 4140 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
4141 if (it->generation == sd->generation) 4141 if (it->generation == sd->generation)
4142 { 4142 {
4143 eo_event_callback_call(WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it); 4143 eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
4144 if (_elm_config->atspi_mode) 4144 if (_elm_config->atspi_mode)
4145 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE); 4145 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
4146 } 4146 }
diff --git a/src/lib/elementary/elm_genlist.c b/src/lib/elementary/elm_genlist.c
index 27b860b550..fb3020c7f3 100644
--- a/src/lib/elementary/elm_genlist.c
+++ b/src/lib/elementary/elm_genlist.c
@@ -3793,7 +3793,7 @@ _item_unselect(Elm_Gen_Item *it)
3793 it->selected = EINA_FALSE; 3793 it->selected = EINA_FALSE;
3794 sd->selected = eina_list_remove(sd->selected, EO_OBJ(it)); 3794 sd->selected = eina_list_remove(sd->selected, EO_OBJ(it));
3795 eo_event_callback_call 3795 eo_event_callback_call
3796 (WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(it)); 3796 (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it));
3797 if (_elm_config->atspi_mode) 3797 if (_elm_config->atspi_mode)
3798 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE); 3798 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
3799} 3799}
@@ -5833,7 +5833,7 @@ _item_select(Elm_Gen_Item *it)
5833 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it); 5833 if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
5834 // delete item if it's requested deletion in the above callbacks. 5834 // delete item if it's requested deletion in the above callbacks.
5835 if ((it->base)->on_deletion) goto item_deleted; 5835 if ((it->base)->on_deletion) goto item_deleted;
5836 eo_event_callback_call(WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it); 5836 eo_event_callback_call(WIDGET(it), EFL_UI_EVENT_SELECTED, eo_it);
5837 if (_elm_config->atspi_mode) 5837 if (_elm_config->atspi_mode)
5838 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE); 5838 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
5839 // delete item if it's requested deletion in the above callbacks. 5839 // delete item if it's requested deletion in the above callbacks.
diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo
index dd5f2b423e..f6d76868a6 100644
--- a/src/lib/elementary/elm_genlist.eo
+++ b/src/lib/elementary/elm_genlist.eo
@@ -4,7 +4,7 @@ import elm_genlist_item;
4 4
5class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable, 5class Elm.Genlist (Elm.Layout, Elm.Interface_Scrollable, Efl.Ui.Clickable,
6 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection, 6 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
7 Evas.Selectable_Interface) 7 Efl.Ui.Selectable)
8{ 8{
9 legacy_prefix: elm_genlist; 9 legacy_prefix: elm_genlist;
10 eo_prefix: elm_obj_genlist; 10 eo_prefix: elm_obj_genlist;
diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo
index d8a02e9426..81a270d50d 100644
--- a/src/lib/elementary/elm_hoversel.eo
+++ b/src/lib/elementary/elm_hoversel.eo
@@ -1,5 +1,5 @@
1import elm_icon; 1import elm_icon;
2class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface, 2class Elm.Hoversel (Elm.Button, Efl.Ui.Selectable,
3 Efl.Ui.Clickable, 3 Efl.Ui.Clickable,
4 Elm.Interface.Atspi_Widget_Action) 4 Elm.Interface.Atspi_Widget_Action)
5{ 5{
diff --git a/src/lib/elementary/elm_index.c b/src/lib/elementary/elm_index.c
index c35282ecc3..1715358f4a 100644
--- a/src/lib/elementary/elm_index.c
+++ b/src/lib/elementary/elm_index.c
@@ -858,7 +858,7 @@ _on_mouse_up(void *data,
858 eo_event_callback_call 858 eo_event_callback_call
859 (data, EFL_UI_EVENT_CLICKED, eo_item); 859 (data, EFL_UI_EVENT_CLICKED, eo_item);
860 eo_event_callback_call 860 eo_event_callback_call
861 (data, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_item); 861 (data, EFL_UI_EVENT_SELECTED, eo_item);
862 eo_id_item = eo_item; 862 eo_id_item = eo_item;
863 ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item); 863 ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item);
864 if (id_item->func) 864 if (id_item->func)
@@ -1349,7 +1349,7 @@ _elm_index_item_selected_set(Eo *eo_it,
1349 eo_event_callback_call 1349 eo_event_callback_call
1350 (obj, ELM_INDEX_EVENT_CHANGED, eo_it); 1350 (obj, ELM_INDEX_EVENT_CHANGED, eo_it);
1351 eo_event_callback_call 1351 eo_event_callback_call
1352 (obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it); 1352 (obj, EFL_UI_EVENT_SELECTED, eo_it);
1353 ecore_timer_del(sd->delay); 1353 ecore_timer_del(sd->delay);
1354 sd->delay = ecore_timer_add(sd->delay_change_time, 1354 sd->delay = ecore_timer_add(sd->delay_change_time,
1355 _delay_change_cb, obj); 1355 _delay_change_cb, obj);
diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo
index 2ae62d9b46..db84d59ffb 100644
--- a/src/lib/elementary/elm_index.eo
+++ b/src/lib/elementary/elm_index.eo
@@ -1,5 +1,5 @@
1class Elm.Index (Elm.Layout, Efl.Orientation, 1class Elm.Index (Elm.Layout, Efl.Orientation,
2 Efl.Ui.Clickable, Evas.Selectable_Interface) 2 Efl.Ui.Clickable, Efl.Ui.Selectable)
3{ 3{
4 legacy_prefix: elm_index; 4 legacy_prefix: elm_index;
5 eo_prefix: elm_obj_index; 5 eo_prefix: elm_obj_index;
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index 2629710072..a629e9f211 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -1413,7 +1413,7 @@ call:
1413 _elm_list_walk(sd); 1413 _elm_list_walk(sd);
1414 1414
1415 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it); 1415 if (it->func) it->func((void *)WIDGET_ITEM_DATA_GET(eo_it), WIDGET(it), eo_it);
1416 eo_event_callback_call(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it); 1416 eo_event_callback_call(obj, EFL_UI_EVENT_SELECTED, eo_it);
1417 if (_elm_config->atspi_mode) 1417 if (_elm_config->atspi_mode)
1418 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE); 1418 elm_interface_atspi_accessible_state_changed_signal_emit(eo_it, ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
1419 sd->last_selected_item = eo_it; 1419 sd->last_selected_item = eo_it;
@@ -1483,7 +1483,7 @@ _item_unselect(Elm_List_Item_Data *it)
1483 if (!(it->base->disabled || 1483 if (!(it->base->disabled ||
1484 (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE))) 1484 (sd->select_mode == ELM_OBJECT_SELECT_MODE_NONE)))
1485 eo_event_callback_call 1485 eo_event_callback_call
1486 (WIDGET(it), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(it)); 1486 (WIDGET(it), EFL_UI_EVENT_UNSELECTED, EO_OBJ(it));
1487 if (_elm_config->atspi_mode) 1487 if (_elm_config->atspi_mode)
1488 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE); 1488 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
1489 } 1489 }
diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo
index 0bf9d032fe..b5ea675467 100644
--- a/src/lib/elementary/elm_list.eo
+++ b/src/lib/elementary/elm_list.eo
@@ -38,7 +38,7 @@ enum Elm.List.Mode
38 38
39class Elm.List (Elm.Layout, Elm.Interface_Scrollable, 39class Elm.List (Elm.Layout, Elm.Interface_Scrollable,
40 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection, 40 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
41 Efl.Ui.Clickable, Evas.Selectable_Interface) 41 Efl.Ui.Clickable, Efl.Ui.Selectable)
42{ 42{
43 legacy_prefix: elm_list; 43 legacy_prefix: elm_list;
44 eo_prefix: elm_obj_list; 44 eo_prefix: elm_obj_list;
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 8543f2cbb3..3c34ec72e1 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -159,7 +159,7 @@ _item_unselect(Elm_Toolbar_Item_Data *item)
159 elm_layout_signal_emit(VIEW(item), "elm,state,unselected", "elm"); 159 elm_layout_signal_emit(VIEW(item), "elm,state,unselected", "elm");
160 if (item->icon) 160 if (item->icon)
161 elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm"); 161 elm_widget_signal_emit(item->icon, "elm,state,unselected", "elm");
162 eo_event_callback_call(WIDGET(item), EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, EO_OBJ(item)); 162 eo_event_callback_call(WIDGET(item), EFL_UI_EVENT_UNSELECTED, EO_OBJ(item));
163 if (_elm_config->atspi_mode) 163 if (_elm_config->atspi_mode)
164 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE); 164 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(item), ELM_ATSPI_STATE_SELECTED, EINA_FALSE);
165} 165}
@@ -1174,7 +1174,7 @@ _item_select(Elm_Toolbar_Item_Data *it)
1174 { 1174 {
1175 if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it)); 1175 if (it->func) it->func((void *)(WIDGET_ITEM_DATA_GET(EO_OBJ(it))), WIDGET(it), EO_OBJ(it));
1176 } 1176 }
1177 eo_event_callback_call(obj, EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, EO_OBJ(it)); 1177 eo_event_callback_call(obj, EFL_UI_EVENT_SELECTED, EO_OBJ(it));
1178 if (_elm_config->atspi_mode) 1178 if (_elm_config->atspi_mode)
1179 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_TRUE); 1179 elm_interface_atspi_accessible_state_changed_signal_emit(EO_OBJ(it), ELM_ATSPI_STATE_SELECTED, EINA_TRUE);
1180} 1180}
diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo
index 961ff4a23c..c749a05e79 100644
--- a/src/lib/elementary/elm_toolbar.eo
+++ b/src/lib/elementary/elm_toolbar.eo
@@ -26,7 +26,7 @@ enum Elm.Toolbar.Shrink_Mode
26 26
27class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation, 27class Elm.Toolbar (Elm.Widget, Elm.Interface_Scrollable, Efl.Orientation,
28 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection, 28 Elm.Interface.Atspi_Widget_Action, Elm.Interface.Atspi.Selection,
29 Efl.Ui.Clickable, Evas.Selectable_Interface) 29 Efl.Ui.Clickable, Efl.Ui.Selectable)
30{ 30{
31 legacy_prefix: elm_toolbar; 31 legacy_prefix: elm_toolbar;
32 eo_prefix: elm_obj_toolbar; 32 eo_prefix: elm_obj_toolbar;
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 465972ca9a..2547431f4b 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -5,7 +5,7 @@
5#include "canvas/efl_ui_draggable.eo.h" 5#include "canvas/efl_ui_draggable.eo.h"
6#include "canvas/efl_ui_clickable.eo.h" 6#include "canvas/efl_ui_clickable.eo.h"
7#include "canvas/efl_ui_scrollable.eo.h" 7#include "canvas/efl_ui_scrollable.eo.h"
8#include "canvas/evas_selectable_interface.eo.h" 8#include "canvas/efl_ui_selectable.eo.h"
9#include "canvas/evas_zoomable_interface.eo.h" 9#include "canvas/evas_zoomable_interface.eo.h"
10 10
11#include "canvas/evas_canvas.eo.h" 11#include "canvas/evas_canvas.eo.h"
diff --git a/src/lib/evas/canvas/common_interfaces.c b/src/lib/evas/canvas/common_interfaces.c
index 095bde248d..0cbbd8e8e8 100644
--- a/src/lib/evas/canvas/common_interfaces.c
+++ b/src/lib/evas/canvas/common_interfaces.c
@@ -4,5 +4,5 @@
4#include "canvas/efl_ui_draggable.eo.c" 4#include "canvas/efl_ui_draggable.eo.c"
5#include "canvas/efl_ui_clickable.eo.c" 5#include "canvas/efl_ui_clickable.eo.c"
6#include "canvas/efl_ui_scrollable.eo.c" 6#include "canvas/efl_ui_scrollable.eo.c"
7#include "canvas/evas_selectable_interface.eo.c" 7#include "canvas/efl_ui_selectable.eo.c"
8#include "canvas/evas_zoomable_interface.eo.c" 8#include "canvas/evas_zoomable_interface.eo.c"
diff --git a/src/lib/evas/canvas/evas_selectable_interface.eo b/src/lib/evas/canvas/efl_ui_selectable.eo
index aa6669096b..b2421e34c3 100644
--- a/src/lib/evas/canvas/evas_selectable_interface.eo
+++ b/src/lib/evas/canvas/efl_ui_selectable.eo
@@ -1,5 +1,6 @@
1interface Evas.Selectable_Interface () 1interface Efl.Ui.Selectable ()
2{ 2{
3 event_prefix: efl_ui;
3 events { 4 events {
4 selected; 5 selected;
5 unselected; 6 unselected;