bu5hm4n pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fc12e7721fd2ea2b39f9a732522e744d43a66840
commit fc12e7721fd2ea2b39f9a732522e744d43a66840
Author: Marcel Hollerbach <m...@marcel-hollerbach.de>
Date: Mon Aug 5 18:35:13 2019 +0200
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.blumenkra...@gmail.com>
Differential Revision: https://phab.enlightenment.org/D9498
---
src/lib/efl/Efl.h | 3 ++-
src/lib/efl/interfaces/efl_interfaces_main.c | 3 ++-
src/lib/efl/interfaces/efl_ui_container_selectable.eo | 11 +++++++++++
.../{efl_ui_selectable.eo => efl_ui_text_selectable.eo} | 8 ++------
src/lib/efl/interfaces/meson.build | 3 ++-
src/lib/elementary/efl_ui_collection.eo | 2 +-
src/lib/elementary/efl_ui_item.eo | 8 ++++----
src/lib/elementary/efl_ui_list_view.eo | 2 +-
src/lib/elementary/efl_ui_text.eo | 2 +-
src/lib/elementary/elc_combobox.c | 2 +-
src/lib/elementary/elm_actionslider_eo.c | 2 +-
src/lib/elementary/elm_diskselector_eo.c | 2 +-
src/lib/elementary/elm_entry_eo.c | 2 +-
src/lib/elementary/elm_fileselector_entry_eo.c | 2 +-
src/lib/elementary/elm_fileselector_eo.c | 2 +-
src/lib/elementary/elm_flipselector_eo.c | 2 +-
src/lib/elementary/elm_genlist_eo.c | 2 +-
src/lib/elementary/elm_hoversel_eo.c | 2 +-
src/lib/elementary/elm_index_eo.c | 2 +-
src/lib/elementary/elm_list_eo.c | 2 +-
src/lib/elementary/elm_toolbar_eo.c | 2 +-
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;
#include "interfaces/efl_ui_scrollable.eo.h"
#include "interfaces/efl_ui_scrollbar.eo.h"
#include "interfaces/efl_ui_scrollable_interactive.eo.h"
-#include "interfaces/efl_ui_selectable.eo.h"
+#include "interfaces/efl_ui_text_selectable.eo.h"
+#include "interfaces/efl_ui_container_selectable.eo.h"
#include "interfaces/efl_ui_multi_selectable.eo.h"
#include "interfaces/efl_ui_zoom.eo.h"
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 @@
#include "interfaces/efl_ui_scrollable.eo.c"
#include "interfaces/efl_ui_scrollable_interactive.eo.c"
#include "interfaces/efl_ui_scrollbar.eo.c"
-#include "interfaces/efl_ui_selectable.eo.c"
+#include "interfaces/efl_ui_container_selectable.eo.c"
+#include "interfaces/efl_ui_text_selectable.eo.c"
#include "interfaces/efl_ui_multi_selectable.eo.c"
#include "interfaces/efl_ui_zoom.eo.c"
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 @@
+interface @beta Efl.Ui.Container_Selectable
+{
+ [[Temporare interface, this is here until collection_view lands]]
+ event_prefix: efl_ui;
+ events {
+ /* FIXME: Called with multiple types of event_info! */
+ item,selected: Efl.Object; [[Called when selected]]
+ /* FIXME: Called with multiple types of event_info! */
+ item,unselected: Efl.Object; [[Called when no longer selected]]
+ }
+}
diff --git a/src/lib/efl/interfaces/efl_ui_selectable.eo
b/src/lib/efl/interfaces/efl_ui_text_selectable.eo
similarity index 57%
rename from src/lib/efl/interfaces/efl_ui_selectable.eo
rename to 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 @@
-interface @beta Efl.Ui.Selectable
+interface @beta Efl.Ui.Text_Selectable
{
- [[Efl UI selectable interface]]
+ [[Efl UI text selectable interface]]
event_prefix: efl_ui;
events {
- /* FIXME: Called with multiple types of event_info! */
- item,selected: Efl.Object; [[Called when selected]]
- /* FIXME: Called with multiple types of event_info! */
- item,unselected: Efl.Object; [[Called when no longer selected]]
selection,paste: void; [[Called when selection is pasted]]
selection,copy: void; [[Called when selection is copied]]
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 = [
'efl_ui_scrollable.eo',
'efl_ui_scrollable_interactive.eo',
'efl_ui_scrollbar.eo',
- 'efl_ui_selectable.eo',
+ 'efl_ui_container_selectable.eo',
+ 'efl_ui_text_selectable.eo',
'efl_ui_zoom.eo',
]
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
Efl.Ui.Scrollbar,
Efl.Pack_Linear, Efl.Pack_Layout,
Efl.Ui.Layout_Orientable,
- Efl.Ui.Selectable,
+ Efl.Ui.Container_Selectable,
Efl.Ui.Multi_Selectable,
Efl.Ui.Focus.Manager_Sub,
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 @@
-abstract @beta Efl.Ui.Item extends Efl.Ui.Layout_Base implements
Efl.Ui.Selectable, Efl.Input.Clickable
+abstract @beta Efl.Ui.Item extends Efl.Ui.Layout_Base implements
Efl.Ui.Container_Selectable, Efl.Input.Clickable
{
[[Selectable Item abstraction.
@@ -6,7 +6,7 @@ abstract @beta Efl.Ui.Item extends Efl.Ui.Layout_Base
implements Efl.Ui.Selectab
like @Efl.Ui.List or @Efl.Ui.Grid, for example.
@Efl.Ui.Item provides user interaction through the @Efl.Input.Clickable
mixin.
Items can be pressed, long-pressed, etc, and appropriate events are
generated.
- @Efl.Ui.Item also implements the @Efl.Ui.Selectable interface, meaning
that "selected" and
+ @Efl.Ui.Item also implements the @Efl.Ui.Container_Selectable interface,
meaning that "selected" and
"unselected" events are automatically generated.
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
Some events are converted to edje signals so the theme can react to them:
@[Efl.Input.Clickable.pressed] -> "efl,state,pressed",
@[Efl.Input.Clickable.unpressed] -> "efl,state,unpressed",
- @[Efl.Ui.Selectable.item,selected] -> "efl,state,selected",
- @[Efl.Ui.Selectable.item,unselected] -> "efl,state,unselected".
+ @[Efl.Ui.Container_Selectable.item,selected] -> "efl,state,selected",
+ @[Efl.Ui.Container_Selectable.item,unselected] ->
"efl,state,unselected".
]]
methods {
@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
}
class @beta Efl.Ui.List_View extends Efl.Ui.Layout_Base implements
Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
Efl.Access.Widget.Action, Efl.Access.Selection,
Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
- Efl.Ui.Selectable, Efl.Ui.List_View_Model,
Efl.Ui.Widget_Focus_Manager
+ Efl.Ui.Container_Selectable, Efl.Ui.List_View_Model,
Efl.Ui.Widget_Focus_Manager
{
methods {
@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;
class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements
Efl.Input.Clickable,
Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
- Efl.Ui.Selectable, Efl.Text_Interactive, Efl.Text_Markup
+ Efl.Ui.Text_Selectable, Efl.Text_Interactive, Efl.Text_Markup
{
[[A flexible text widget which can be static (as a label) or editable by
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
= {
NULL
};
-EFL_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);
+EFL_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);
EAPI Eina_Bool
elm_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 = {
NULL
};
-EFL_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);
+EFL_DEFINE_CLASS(elm_actionslider_class_get, &_elm_actionslider_class_desc,
EFL_UI_LAYOUT_BASE_CLASS, ELM_LAYOUT_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
#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 = {
NULL
};
-EFL_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);
+EFL_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);
#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
= {
NULL
};
-EFL_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);
+EFL_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);
#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 = {
NULL
};
-EFL_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);
+EFL_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 = {
_elm_fileselector_class_destructor
};
-EFL_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);
+EFL_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);
#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 = {
NULL
};
-EFL_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);
+EFL_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);
#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
= {
NULL
};
-EFL_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);
+EFL_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);
#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
= {
NULL
};
-EFL_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);
+EFL_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);
#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 = {
NULL
};
-EFL_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);
+EFL_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);
#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 = {
NULL
};
-EFL_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);
+EFL_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);
#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
= {
NULL
};
-EFL_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);
+EFL_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);
#include "elm_toolbar_eo.legacy.c"
--
