jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=fcae72b0e3057776bc75d4865cfb51be6eb72a98
commit fcae72b0e3057776bc75d4865cfb51be6eb72a98
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Wed Aug 23 18:02:42 2017 +0900
widget: Remove 2 focus APIs from EO
They are internal and use an undefined type.
Also, completely deprecated with the new focus manager.
Ref T5363
---
src/lib/elementary/elm_widget.c | 8 ++++----
src/lib/elementary/elm_widget.eo | 27 ---------------------------
2 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index f4c768843f..abbae709c7 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -2667,8 +2667,8 @@ _elm_widget_focus_direction_get(const Eo *obj,
Elm_Widget_Smart_Data *sd, const
*
* @ingroup Widget
*/
-EOLIAN static Eina_Bool
-_elm_widget_focus_list_direction_get(const Eo *obj EINA_UNUSED,
Elm_Widget_Smart_Data *_pd EINA_UNUSED, const Evas_Object *base, const
Eina_List *items, list_data_get_func_type list_data_get, double degree,
Evas_Object **direction, Elm_Object_Item **direction_item, double *weight)
+EAPI Eina_Bool
+elm_widget_focus_list_direction_get(const Eo *obj EINA_UNUSED, const
Evas_Object *base, const Eina_List *items, list_data_get_func_type
list_data_get, double degree, Evas_Object **direction, Elm_Object_Item
**direction_item, double *weight)
{
if (!direction || !weight || !base || !items)
return EINA_FALSE;
@@ -2849,8 +2849,8 @@ _elm_widget_focus_next_get(const Eo *obj,
Elm_Widget_Smart_Data *sd, Elm_Focus_D
*
* @ingroup Widget
*/
-EOLIAN static Eina_Bool
-_elm_widget_focus_list_next_get(const Eo *obj, Elm_Widget_Smart_Data *_pd
EINA_UNUSED, const Eina_List *items, list_data_get_func_type list_data_get,
Elm_Focus_Direction dir, Evas_Object **next, Elm_Object_Item **next_item)
+EAPI Eina_Bool
+elm_widget_focus_list_next_get(const Eo *obj, const Eina_List *items,
list_data_get_func_type list_data_get, Elm_Focus_Direction dir, Evas_Object
**next, Elm_Object_Item **next_item)
{
Eina_List *(*list_next)(const Eina_List *list) = NULL;
Evas_Object *focused_object = NULL;
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index 79ca3e95e3..2c9454ef1c 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -1,9 +1,6 @@
import elm_general;
import efl_input_types;
-/* FIXME: This shouldn't be here. */
-type list_data_get_func_type: __undefined_type; [[Elementary list data get
function type]]
-
function Efl.Ui.Scrollable_On_Show_Region
{
params {
@@ -592,19 +589,6 @@ abstract Elm.Widget (Efl.Canvas.Group,
Elm.Interface.Atspi_Accessible,
@in recurse: int; [[Depth in the tree to search for the widget]]
}
}
- focus_list_direction_get @const {
- [[Get focus list direction]]
- return: bool; [[$true on success, $false otherwise]]
- params {
- @in base: const(Efl.Canvas.Object); [[Base object]]
- @in items: const(list<Efl.Object>); [[Item list]]
- @in list_data_get: list_data_get_func_type; [[Data get function]]
- @in degree: double; [[Degree]]
- @out direction: Efl.Canvas.Object; [[Direction]]
- @out direction_item: Elm.Widget.Item; [[Direction item]]
- @out weight: double; [[Weight]]
- }
- }
focused_object_clear {
[[Clear focused object]]
}
@@ -694,17 +678,6 @@ abstract Elm.Widget (Efl.Canvas.Group,
Elm.Interface.Atspi_Accessible,
}
return: bool; [[$true on success, $false otherwise]]
}
- focus_list_next_get @const {
- [[Get next item in focus list]]
- return: bool; [[$true on success, $false otherwise]]
- params {
- @in items: const(list<Efl.Object>); [[Item list]]
- @in list_data_get: list_data_get_func_type; [[Function type]]
- @in dir: Elm.Focus_Direction; [[Focus direction]]
- @out next: Efl.Canvas.Object; [[Next object]]
- @out next_item: Elm.Widget.Item; [[Next item]]
- }
- }
focus_mouse_up_handle {
[[Handle focus mouse up]]
legacy: null;
--
