summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-08-05 18:35:13 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-08-05 19:49:12 +0200
commitfc12e7721fd2ea2b39f9a732522e744d43a66840 (patch)
tree8ae44eafc4cf14f9a5e84f50026c6ede41f9e279
parent53649030db9a46dd7a25a2cc41bc1d7d7a1b2460 (diff)
efl_ui_selectable: split this up
i dont know why, but something got badly mixed up, the selection APIs for text and item ended up in the same interface, which seems ... weird ? This commit splits that up into container_selectable and text_selectable, there is no future plan on my list for text_selection. The rest of this series is working towards removing container_selectable, replacing it with a new interface. However, the interface will stay until list_view is replaced. The changes in the legacy code are removing the efl.ui.selection interface from it, item emission is not depending on the inherited interfaces, additionally, this interface does not provide any API, so this should not be an issue. ref T7766 Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Differential Revision: https://phab.enlightenment.org/D9498
-rw-r--r--src/lib/efl/Efl.h3
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c3
-rw-r--r--src/lib/efl/interfaces/efl_ui_container_selectable.eo11
-rw-r--r--src/lib/efl/interfaces/efl_ui_text_selectable.eo (renamed from src/lib/efl/interfaces/efl_ui_selectable.eo)8
-rw-r--r--src/lib/efl/interfaces/meson.build3
-rw-r--r--src/lib/elementary/efl_ui_collection.eo2
-rw-r--r--src/lib/elementary/efl_ui_item.eo8
-rw-r--r--src/lib/elementary/efl_ui_list_view.eo2
-rw-r--r--src/lib/elementary/efl_ui_text.eo2
-rw-r--r--src/lib/elementary/elc_combobox.c2
-rw-r--r--src/lib/elementary/elm_actionslider_eo.c2
-rw-r--r--src/lib/elementary/elm_diskselector_eo.c2
-rw-r--r--src/lib/elementary/elm_entry_eo.c2
-rw-r--r--src/lib/elementary/elm_fileselector_entry_eo.c2
-rw-r--r--src/lib/elementary/elm_fileselector_eo.c2
-rw-r--r--src/lib/elementary/elm_flipselector_eo.c2
-rw-r--r--src/lib/elementary/elm_genlist_eo.c2
-rw-r--r--src/lib/elementary/elm_hoversel_eo.c2
-rw-r--r--src/lib/elementary/elm_index_eo.c2
-rw-r--r--src/lib/elementary/elm_list_eo.c2
-rw-r--r--src/lib/elementary/elm_toolbar_eo.c2
21 files changed, 38 insertions, 28 deletions
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 97c21ec3fb..c1c934f6b0 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -107,7 +107,8 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
107#include "interfaces/efl_ui_scrollable.eo.h" 107#include "interfaces/efl_ui_scrollable.eo.h"
108#include "interfaces/efl_ui_scrollbar.eo.h" 108#include "interfaces/efl_ui_scrollbar.eo.h"
109#include "interfaces/efl_ui_scrollable_interactive.eo.h" 109#include "interfaces/efl_ui_scrollable_interactive.eo.h"
110#include "interfaces/efl_ui_selectable.eo.h" 110#include "interfaces/efl_ui_text_selectable.eo.h"
111#include "interfaces/efl_ui_container_selectable.eo.h"
111#include "interfaces/efl_ui_multi_selectable.eo.h" 112#include "interfaces/efl_ui_multi_selectable.eo.h"
112#include "interfaces/efl_ui_zoom.eo.h" 113#include "interfaces/efl_ui_zoom.eo.h"
113 114
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 0817211ffb..141a2904a7 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -75,7 +75,8 @@
75#include "interfaces/efl_ui_scrollable.eo.c" 75#include "interfaces/efl_ui_scrollable.eo.c"
76#include "interfaces/efl_ui_scrollable_interactive.eo.c" 76#include "interfaces/efl_ui_scrollable_interactive.eo.c"
77#include "interfaces/efl_ui_scrollbar.eo.c" 77#include "interfaces/efl_ui_scrollbar.eo.c"
78#include "interfaces/efl_ui_selectable.eo.c" 78#include "interfaces/efl_ui_container_selectable.eo.c"
79#include "interfaces/efl_ui_text_selectable.eo.c"
79#include "interfaces/efl_ui_multi_selectable.eo.c" 80#include "interfaces/efl_ui_multi_selectable.eo.c"
80#include "interfaces/efl_ui_zoom.eo.c" 81#include "interfaces/efl_ui_zoom.eo.c"
81 82
diff --git a/src/lib/efl/interfaces/efl_ui_container_selectable.eo b/src/lib/efl/interfaces/efl_ui_container_selectable.eo
new file mode 100644
index 0000000000..0d7fda5409
--- /dev/null
+++ b/src/lib/efl/interfaces/efl_ui_container_selectable.eo
@@ -0,0 +1,11 @@
1interface @beta Efl.Ui.Container_Selectable
2{
3 [[Temporare interface, this is here until collection_view lands]]
4 event_prefix: efl_ui;
5 events {
6 /* FIXME: Called with multiple types of event_info! */
7 item,selected: Efl.Object; [[Called when selected]]
8 /* FIXME: Called with multiple types of event_info! */
9 item,unselected: Efl.Object; [[Called when no longer selected]]
10 }
11}
diff --git a/src/lib/efl/interfaces/efl_ui_selectable.eo b/src/lib/efl/interfaces/efl_ui_text_selectable.eo
index 1105fe42d2..b5ad3bd67b 100644
--- a/src/lib/efl/interfaces/efl_ui_selectable.eo
+++ b/src/lib/efl/interfaces/efl_ui_text_selectable.eo
@@ -1,12 +1,8 @@
1interface @beta Efl.Ui.Selectable 1interface @beta Efl.Ui.Text_Selectable
2{ 2{
3 [[Efl UI selectable interface]] 3 [[Efl UI text selectable interface]]
4 event_prefix: efl_ui; 4 event_prefix: efl_ui;
5 events { 5 events {
6 /* FIXME: Called with multiple types of event_info! */
7 item,selected: Efl.Object; [[Called when selected]]
8 /* FIXME: Called with multiple types of event_info! */
9 item,unselected: Efl.Object; [[Called when no longer selected]]
10 selection,paste: void; [[Called when selection is pasted]] 6 selection,paste: void; [[Called when selection is pasted]]
11 selection,copy: void; [[Called when selection is copied]] 7 selection,copy: void; [[Called when selection is copied]]
12 selection,cut: void; [[Called when selection is cut]] 8 selection,cut: void; [[Called when selection is cut]]
diff --git a/src/lib/efl/interfaces/meson.build b/src/lib/efl/interfaces/meson.build
index abfe721dac..7467882665 100644
--- a/src/lib/efl/interfaces/meson.build
+++ b/src/lib/efl/interfaces/meson.build
@@ -11,7 +11,8 @@ pub_legacy_eo_files = [
11 'efl_ui_scrollable.eo', 11 'efl_ui_scrollable.eo',
12 'efl_ui_scrollable_interactive.eo', 12 'efl_ui_scrollable_interactive.eo',
13 'efl_ui_scrollbar.eo', 13 'efl_ui_scrollbar.eo',
14 'efl_ui_selectable.eo', 14 'efl_ui_container_selectable.eo',
15 'efl_ui_text_selectable.eo',
15 'efl_ui_zoom.eo', 16 'efl_ui_zoom.eo',
16] 17]
17 18
diff --git a/src/lib/elementary/efl_ui_collection.eo b/src/lib/elementary/efl_ui_collection.eo
index 26f3bb3bc0..679ef39062 100644
--- a/src/lib/elementary/efl_ui_collection.eo
+++ b/src/lib/elementary/efl_ui_collection.eo
@@ -3,7 +3,7 @@ class @beta Efl.Ui.Collection extends Efl.Ui.Layout_Base implements
3 Efl.Ui.Scrollbar, 3 Efl.Ui.Scrollbar,
4 Efl.Pack_Linear, Efl.Pack_Layout, 4 Efl.Pack_Linear, Efl.Pack_Layout,
5 Efl.Ui.Layout_Orientable, 5 Efl.Ui.Layout_Orientable,
6 Efl.Ui.Selectable, 6 Efl.Ui.Container_Selectable,
7 Efl.Ui.Multi_Selectable, 7 Efl.Ui.Multi_Selectable,
8 Efl.Ui.Focus.Manager_Sub, 8 Efl.Ui.Focus.Manager_Sub,
9 Efl.Ui.Widget_Focus_Manager 9 Efl.Ui.Widget_Focus_Manager
diff --git a/src/lib/elementary/efl_ui_item.eo b/src/lib/elementary/efl_ui_item.eo
index a2a7ad71fd..331f48a8e1 100644
--- a/src/lib/elementary/efl_ui_item.eo
+++ b/src/lib/elementary/efl_ui_item.eo
@@ -1,4 +1,4 @@
1abstract @beta Efl.Ui.Item extends Efl.Ui.Layout_Base implements Efl.Ui.Selectable, Efl.Input.Clickable 1abstract @beta Efl.Ui.Item extends Efl.Ui.Layout_Base implements Efl.Ui.Container_Selectable, Efl.Input.Clickable
2{ 2{
3 [[Selectable Item abstraction. 3 [[Selectable Item abstraction.
4 4
@@ -6,7 +6,7 @@ abstract @beta Efl.Ui.Item extends Efl.Ui.Layout_Base implements Efl.Ui.Selectab
6 like @Efl.Ui.List or @Efl.Ui.Grid, for example. 6 like @Efl.Ui.List or @Efl.Ui.Grid, for example.
7 @Efl.Ui.Item provides user interaction through the @Efl.Input.Clickable mixin. 7 @Efl.Ui.Item provides user interaction through the @Efl.Input.Clickable mixin.
8 Items can be pressed, long-pressed, etc, and appropriate events are generated. 8 Items can be pressed, long-pressed, etc, and appropriate events are generated.
9 @Efl.Ui.Item also implements the @Efl.Ui.Selectable interface, meaning that "selected" and 9 @Efl.Ui.Item also implements the @Efl.Ui.Container_Selectable interface, meaning that "selected" and
10 "unselected" events are automatically generated. 10 "unselected" events are automatically generated.
11 11
12 Classes inheriting from this one only need to deal with the visual representation of the widget. 12 Classes inheriting from this one only need to deal with the visual representation of the widget.
@@ -15,8 +15,8 @@ abstract @beta Efl.Ui.Item extends Efl.Ui.Layout_Base implements Efl.Ui.Selectab
15 Some events are converted to edje signals so the theme can react to them: 15 Some events are converted to edje signals so the theme can react to them:
16 @[Efl.Input.Clickable.pressed] -> "efl,state,pressed", 16 @[Efl.Input.Clickable.pressed] -> "efl,state,pressed",
17 @[Efl.Input.Clickable.unpressed] -> "efl,state,unpressed", 17 @[Efl.Input.Clickable.unpressed] -> "efl,state,unpressed",
18 @[Efl.Ui.Selectable.item,selected] -> "efl,state,selected", 18 @[Efl.Ui.Container_Selectable.item,selected] -> "efl,state,selected",
19 @[Efl.Ui.Selectable.item,unselected] -> "efl,state,unselected". 19 @[Efl.Ui.Container_Selectable.item,unselected] -> "efl,state,unselected".
20 ]] 20 ]]
21 methods { 21 methods {
22 @property index { 22 @property index {
diff --git a/src/lib/elementary/efl_ui_list_view.eo b/src/lib/elementary/efl_ui_list_view.eo
index b1560ef5ba..b5e15591a6 100644
--- a/src/lib/elementary/efl_ui_list_view.eo
+++ b/src/lib/elementary/efl_ui_list_view.eo
@@ -9,7 +9,7 @@ struct @beta Efl.Ui.List_View_Item_Event
9} 9}
10class @beta Efl.Ui.List_View extends Efl.Ui.Layout_Base implements Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar, 10class @beta Efl.Ui.List_View extends Efl.Ui.Layout_Base implements Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
11 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub, 11 Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
12 Efl.Ui.Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager 12 Efl.Ui.Container_Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager
13{ 13{
14 methods { 14 methods {
15 @property homogeneous { 15 @property homogeneous {
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index b52a3923a4..a7ec16e8fe 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -3,7 +3,7 @@ import elm_general;
3 3
4class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickable, 4class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
5 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, 5 Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
6 Efl.Ui.Selectable, Efl.Text_Interactive, Efl.Text_Markup 6 Efl.Ui.Text_Selectable, Efl.Text_Interactive, Efl.Text_Markup
7{ 7{
8 [[A flexible text widget which can be static (as a label) or editable by 8 [[A flexible text widget which can be static (as a label) or editable by
9 the user (as a text entry). It provides all sorts of editing facilities 9 the user (as a text entry). It provides all sorts of editing facilities
diff --git a/src/lib/elementary/elc_combobox.c b/src/lib/elementary/elc_combobox.c
index 15bf664198..200745a97b 100644
--- a/src/lib/elementary/elc_combobox.c
+++ b/src/lib/elementary/elc_combobox.c
@@ -631,7 +631,7 @@ static const Efl_Class_Description _elm_combobox_class_desc = {
631 NULL 631 NULL
632}; 632};
633 633
634EFL_DEFINE_CLASS(elm_combobox_class_get, &_elm_combobox_class_desc, EFL_UI_BUTTON_CLASS, EFL_UI_SELECTABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_ENTRY_CLASS, ELM_GENLIST_CLASS, ELM_HOVER_CLASS, EFL_UI_LEGACY_INTERFACE, NULL); 634EFL_DEFINE_CLASS(elm_combobox_class_get, &_elm_combobox_class_desc, EFL_UI_BUTTON_CLASS, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_ENTRY_CLASS, ELM_GENLIST_CLASS, ELM_HOVER_CLASS, EFL_UI_LEGACY_INTERFACE, NULL);
635 635
636EAPI Eina_Bool 636EAPI Eina_Bool
637elm_combobox_expanded_get(const Elm_Combobox *obj) 637elm_combobox_expanded_get(const Elm_Combobox *obj)
diff --git a/src/lib/elementary/elm_actionslider_eo.c b/src/lib/elementary/elm_actionslider_eo.c
index 20cd7aa6e2..1a263cae36 100644
--- a/src/lib/elementary/elm_actionslider_eo.c
+++ b/src/lib/elementary/elm_actionslider_eo.c
@@ -77,6 +77,6 @@ static const Efl_Class_Description _elm_actionslider_class_desc = {
77 NULL 77 NULL
78}; 78};
79 79
80EFL_DEFINE_CLASS(elm_actionslider_class_get, &_elm_actionslider_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 80EFL_DEFINE_CLASS(elm_actionslider_class_get, &_elm_actionslider_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
81 81
82#include "elm_actionslider_eo.legacy.c" 82#include "elm_actionslider_eo.legacy.c"
diff --git a/src/lib/elementary/elm_diskselector_eo.c b/src/lib/elementary/elm_diskselector_eo.c
index d4158c4e94..f48f7d84e0 100644
--- a/src/lib/elementary/elm_diskselector_eo.c
+++ b/src/lib/elementary/elm_diskselector_eo.c
@@ -222,6 +222,6 @@ static const Efl_Class_Description _elm_diskselector_class_desc = {
222 NULL 222 NULL
223}; 223};
224 224
225EFL_DEFINE_CLASS(elm_diskselector_class_get, &_elm_diskselector_class_desc, EFL_UI_WIDGET_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SCROLLABLE_INTERFACE, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL); 225EFL_DEFINE_CLASS(elm_diskselector_class_get, &_elm_diskselector_class_desc, EFL_UI_WIDGET_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SCROLLABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
226 226
227#include "elm_diskselector_eo.legacy.c" 227#include "elm_diskselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_entry_eo.c b/src/lib/elementary/elm_entry_eo.c
index 21c9c34eb9..2cdebe49ba 100644
--- a/src/lib/elementary/elm_entry_eo.c
+++ b/src/lib/elementary/elm_entry_eo.c
@@ -1188,6 +1188,6 @@ static const Efl_Class_Description _elm_entry_class_desc = {
1188 NULL 1188 NULL
1189}; 1189};
1190 1190
1191EFL_DEFINE_CLASS(elm_entry_class_get, &_elm_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_TEXT_INTERFACE, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, EFL_FILE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_SCROLLABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 1191EFL_DEFINE_CLASS(elm_entry_class_get, &_elm_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_TEXT_INTERFACE, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, EFL_FILE_MIXIN, EFL_UI_SCROLLABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
1192 1192
1193#include "elm_entry_eo.legacy.c" 1193#include "elm_entry_eo.legacy.c"
diff --git a/src/lib/elementary/elm_fileselector_entry_eo.c b/src/lib/elementary/elm_fileselector_entry_eo.c
index 90ee427d85..4d1637a04c 100644
--- a/src/lib/elementary/elm_fileselector_entry_eo.c
+++ b/src/lib/elementary/elm_fileselector_entry_eo.c
@@ -88,4 +88,4 @@ static const Efl_Class_Description _elm_fileselector_entry_class_desc = {
88 NULL 88 NULL
89}; 89};
90 90
91EFL_DEFINE_CLASS(elm_fileselector_entry_class_get, &_elm_fileselector_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 91EFL_DEFINE_CLASS(elm_fileselector_entry_class_get, &_elm_fileselector_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_fileselector_eo.c b/src/lib/elementary/elm_fileselector_eo.c
index eb74bb1ebd..377da7c451 100644
--- a/src/lib/elementary/elm_fileselector_eo.c
+++ b/src/lib/elementary/elm_fileselector_eo.c
@@ -202,6 +202,6 @@ static const Efl_Class_Description _elm_fileselector_class_desc = {
202 _elm_fileselector_class_destructor 202 _elm_fileselector_class_destructor
203}; 203};
204 204
205EFL_DEFINE_CLASS(elm_fileselector_class_get, &_elm_fileselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 205EFL_DEFINE_CLASS(elm_fileselector_class_get, &_elm_fileselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
206 206
207#include "elm_fileselector_eo.legacy.c" 207#include "elm_fileselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_flipselector_eo.c b/src/lib/elementary/elm_flipselector_eo.c
index c0f01bbd22..cf11af9bb2 100644
--- a/src/lib/elementary/elm_flipselector_eo.c
+++ b/src/lib/elementary/elm_flipselector_eo.c
@@ -154,6 +154,6 @@ static const Efl_Class_Description _elm_flipselector_class_desc = {
154 NULL 154 NULL
155}; 155};
156 156
157EFL_DEFINE_CLASS(elm_flipselector_class_get, &_elm_flipselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_RANGE_INTERACTIVE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 157EFL_DEFINE_CLASS(elm_flipselector_class_get, &_elm_flipselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_RANGE_INTERACTIVE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
158 158
159#include "elm_flipselector_eo.legacy.c" 159#include "elm_flipselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_genlist_eo.c b/src/lib/elementary/elm_genlist_eo.c
index 6ee35fbc2f..51d789fd0a 100644
--- a/src/lib/elementary/elm_genlist_eo.c
+++ b/src/lib/elementary/elm_genlist_eo.c
@@ -681,6 +681,6 @@ static const Efl_Class_Description _elm_genlist_class_desc = {
681 NULL 681 NULL
682}; 682};
683 683
684EFL_DEFINE_CLASS(elm_genlist_class_get, &_elm_genlist_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL); 684EFL_DEFINE_CLASS(elm_genlist_class_get, &_elm_genlist_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
685 685
686#include "elm_genlist_eo.legacy.c" 686#include "elm_genlist_eo.legacy.c"
diff --git a/src/lib/elementary/elm_hoversel_eo.c b/src/lib/elementary/elm_hoversel_eo.c
index 676243e98d..f85f529a1b 100644
--- a/src/lib/elementary/elm_hoversel_eo.c
+++ b/src/lib/elementary/elm_hoversel_eo.c
@@ -189,6 +189,6 @@ static const Efl_Class_Description _elm_hoversel_class_desc = {
189 NULL 189 NULL
190}; 190};
191 191
192EFL_DEFINE_CLASS(elm_hoversel_class_get, &_elm_hoversel_class_desc, EFL_UI_BUTTON_LEGACY_CLASS, EFL_UI_SELECTABLE_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 192EFL_DEFINE_CLASS(elm_hoversel_class_get, &_elm_hoversel_class_desc, EFL_UI_BUTTON_LEGACY_CLASS, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
193 193
194#include "elm_hoversel_eo.legacy.c" 194#include "elm_hoversel_eo.legacy.c"
diff --git a/src/lib/elementary/elm_index_eo.c b/src/lib/elementary/elm_index_eo.c
index 32f46afb01..3de3e903c1 100644
--- a/src/lib/elementary/elm_index_eo.c
+++ b/src/lib/elementary/elm_index_eo.c
@@ -322,6 +322,6 @@ static const Efl_Class_Description _elm_index_class_desc = {
322 NULL 322 NULL
323}; 323};
324 324
325EFL_DEFINE_CLASS(elm_index_class_get, &_elm_index_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL); 325EFL_DEFINE_CLASS(elm_index_class_get, &_elm_index_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
326 326
327#include "elm_index_eo.legacy.c" 327#include "elm_index_eo.legacy.c"
diff --git a/src/lib/elementary/elm_list_eo.c b/src/lib/elementary/elm_list_eo.c
index dbd01f31bd..25f90418f0 100644
--- a/src/lib/elementary/elm_list_eo.c
+++ b/src/lib/elementary/elm_list_eo.c
@@ -363,6 +363,6 @@ static const Efl_Class_Description _elm_list_class_desc = {
363 NULL 363 NULL
364}; 364};
365 365
366EFL_DEFINE_CLASS(elm_list_class_get, &_elm_list_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL); 366EFL_DEFINE_CLASS(elm_list_class_get, &_elm_list_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
367 367
368#include "elm_list_eo.legacy.c" 368#include "elm_list_eo.legacy.c"
diff --git a/src/lib/elementary/elm_toolbar_eo.c b/src/lib/elementary/elm_toolbar_eo.c
index bcb3b23c5f..7bcd98c745 100644
--- a/src/lib/elementary/elm_toolbar_eo.c
+++ b/src/lib/elementary/elm_toolbar_eo.c
@@ -372,6 +372,6 @@ static const Efl_Class_Description _elm_toolbar_class_desc = {
372 NULL 372 NULL
373}; 373};
374 374
375EFL_DEFINE_CLASS(elm_toolbar_class_get, &_elm_toolbar_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL); 375EFL_DEFINE_CLASS(elm_toolbar_class_get, &_elm_toolbar_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
376 376
377#include "elm_toolbar_eo.legacy.c" 377#include "elm_toolbar_eo.legacy.c"