summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 18:02:42 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-23 20:53:20 +0900
commitfcae72b0e3057776bc75d4865cfb51be6eb72a98 (patch)
tree4ab0555698698ed1878939cf0773b247df23c5f9
parent91f9f414718a8846f9c7ca8f083ae014a4494108 (diff)
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
-rw-r--r--src/lib/elementary/elm_widget.c8
-rw-r--r--src/lib/elementary/elm_widget.eo27
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
2667 * 2667 *
2668 * @ingroup Widget 2668 * @ingroup Widget
2669 */ 2669 */
2670EOLIAN static Eina_Bool 2670EAPI Eina_Bool
2671_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) 2671elm_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)
2672{ 2672{
2673 if (!direction || !weight || !base || !items) 2673 if (!direction || !weight || !base || !items)
2674 return EINA_FALSE; 2674 return EINA_FALSE;
@@ -2849,8 +2849,8 @@ _elm_widget_focus_next_get(const Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Focus_D
2849 * 2849 *
2850 * @ingroup Widget 2850 * @ingroup Widget
2851 */ 2851 */
2852EOLIAN static Eina_Bool 2852EAPI Eina_Bool
2853_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) 2853elm_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)
2854{ 2854{
2855 Eina_List *(*list_next)(const Eina_List *list) = NULL; 2855 Eina_List *(*list_next)(const Eina_List *list) = NULL;
2856 Evas_Object *focused_object = NULL; 2856 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 @@
1import elm_general; 1import elm_general;
2import efl_input_types; 2import efl_input_types;
3 3
4/* FIXME: This shouldn't be here. */
5type list_data_get_func_type: __undefined_type; [[Elementary list data get function type]]
6
7function Efl.Ui.Scrollable_On_Show_Region 4function Efl.Ui.Scrollable_On_Show_Region
8{ 5{
9 params { 6 params {
@@ -592,19 +589,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
592 @in recurse: int; [[Depth in the tree to search for the widget]] 589 @in recurse: int; [[Depth in the tree to search for the widget]]
593 } 590 }
594 } 591 }
595 focus_list_direction_get @const {
596 [[Get focus list direction]]
597 return: bool; [[$true on success, $false otherwise]]
598 params {
599 @in base: const(Efl.Canvas.Object); [[Base object]]
600 @in items: const(list<Efl.Object>); [[Item list]]
601 @in list_data_get: list_data_get_func_type; [[Data get function]]
602 @in degree: double; [[Degree]]
603 @out direction: Efl.Canvas.Object; [[Direction]]
604 @out direction_item: Elm.Widget.Item; [[Direction item]]
605 @out weight: double; [[Weight]]
606 }
607 }
608 focused_object_clear { 592 focused_object_clear {
609 [[Clear focused object]] 593 [[Clear focused object]]
610 } 594 }
@@ -694,17 +678,6 @@ abstract Elm.Widget (Efl.Canvas.Group, Elm.Interface.Atspi_Accessible,
694 } 678 }
695 return: bool; [[$true on success, $false otherwise]] 679 return: bool; [[$true on success, $false otherwise]]
696 } 680 }
697 focus_list_next_get @const {
698 [[Get next item in focus list]]
699 return: bool; [[$true on success, $false otherwise]]
700 params {
701 @in items: const(list<Efl.Object>); [[Item list]]
702 @in list_data_get: list_data_get_func_type; [[Function type]]
703 @in dir: Elm.Focus_Direction; [[Focus direction]]
704 @out next: Efl.Canvas.Object; [[Next object]]
705 @out next_item: Elm.Widget.Item; [[Next item]]
706 }
707 }
708 focus_mouse_up_handle { 681 focus_mouse_up_handle {
709 [[Handle focus mouse up]] 682 [[Handle focus mouse up]]
710 legacy: null; 683 legacy: null;