summaryrefslogtreecommitdiff
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-08-30 16:40:22 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-08-31 11:22:04 +0900
commitb6bab481aa8c4297f7692422b61dacf08f9e1d10 (patch)
tree82dceab2ef8b35e57eb10cb04a1f43345d1ed876 /src/lib/elementary/efl_ui_win.c
parentb0fc5dde62f6392ccf2a46c5be6265e72260b137 (diff)
widget: Mark old focus API as beta.
It's not beta. It's about to die. Also, move #define ELM_WIDGET_BETA to the common header file, as it is consequently required by ALL widgets. :( Ping @bu5hm4n :) Ref T5363
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/efl_ui_win.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 1b2bb361aa..82b5636fb6 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1223,9 +1223,9 @@ _elm_win_focus_in(Ecore_Evas *ee)
1223 ELM_WIN_DATA_ALIVE_CHECK(obj, sd); 1223 ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
1224 if (sd->type != ELM_WIN_FAKE) 1224 if (sd->type != ELM_WIN_FAKE)
1225 { 1225 {
1226 if (!elm_widget_focus_order_get(obj)) 1226 if (!elm_obj_widget_focus_order_get(obj))
1227 { 1227 {
1228 elm_widget_focus_steal(obj, NULL); 1228 elm_obj_widget_focus_steal(obj, NULL);
1229 } 1229 }
1230 else 1230 else
1231 { 1231 {
@@ -1236,7 +1236,7 @@ _elm_win_focus_in(Ecore_Evas *ee)
1236 (obj, &newest_focus_order, EINA_TRUE); 1236 (obj, &newest_focus_order, EINA_TRUE);
1237 if (newest && 1237 if (newest &&
1238 (_elm_widget_onscreen_is(newest) || (newest == obj))) 1238 (_elm_widget_onscreen_is(newest) || (newest == obj)))
1239 elm_widget_focus_restore(obj); 1239 elm_obj_widget_focus_restore(obj);
1240 else 1240 else
1241 evas_object_focus_set(obj, EINA_TRUE); 1241 evas_object_focus_set(obj, EINA_TRUE);
1242 } 1242 }
@@ -1653,7 +1653,7 @@ _efl_ui_win_elm_widget_focus_next(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED, Elm
1653 /* Focus chain */ 1653 /* Focus chain */
1654 if (wd->subobjs) 1654 if (wd->subobjs)
1655 { 1655 {
1656 if (!(items = elm_widget_focus_custom_chain_get(obj))) 1656 if (!(items = elm_obj_widget_focus_custom_chain_get(obj)))
1657 { 1657 {
1658 items = wd->subobjs; 1658 items = wd->subobjs;
1659 if (!items) 1659 if (!items)
@@ -1686,7 +1686,7 @@ _efl_ui_win_elm_widget_focus_direction(Eo *obj, Efl_Ui_Win_Data *_pd EINA_UNUSED
1686 /* Focus chain */ 1686 /* Focus chain */
1687 if (wd->subobjs) 1687 if (wd->subobjs)
1688 { 1688 {
1689 if (!(items = elm_widget_focus_custom_chain_get(obj))) 1689 if (!(items = elm_obj_widget_focus_custom_chain_get(obj)))
1690 items = wd->subobjs; 1690 items = wd->subobjs;
1691 1691
1692 list_data_get = eina_list_data_get; 1692 list_data_get = eina_list_data_get;
@@ -2715,7 +2715,7 @@ _win_img_hide(void *data,
2715 Evas_Object *obj EINA_UNUSED, 2715 Evas_Object *obj EINA_UNUSED,
2716 void *event_info EINA_UNUSED) 2716 void *event_info EINA_UNUSED)
2717{ 2717{
2718 elm_widget_focus_hide_handle(data); 2718 elm_obj_widget_focus_hide_handle(data);
2719} 2719}
2720 2720
2721static void 2721static void
@@ -2735,7 +2735,7 @@ _win_img_focus_in(void *data,
2735 Evas_Object *obj EINA_UNUSED, 2735 Evas_Object *obj EINA_UNUSED,
2736 void *event_info EINA_UNUSED) 2736 void *event_info EINA_UNUSED)
2737{ 2737{
2738 elm_widget_focus_steal(data, NULL); 2738 elm_obj_widget_focus_steal(data, NULL);
2739} 2739}
2740 2740
2741static void 2741static void
@@ -2744,7 +2744,7 @@ _win_img_focus_out(void *data,
2744 Evas_Object *obj EINA_UNUSED, 2744 Evas_Object *obj EINA_UNUSED,
2745 void *event_info EINA_UNUSED) 2745 void *event_info EINA_UNUSED)
2746{ 2746{
2747 elm_widget_focused_object_clear(data); 2747 elm_obj_widget_focused_object_clear(data);
2748} 2748}
2749 2749
2750static void 2750static void
@@ -3630,7 +3630,7 @@ _elm_win_focus_reconfigure(void)
3630 Evas_Object *obj; 3630 Evas_Object *obj;
3631 3631
3632 EINA_LIST_FOREACH(_elm_win_list, l, obj) 3632 EINA_LIST_FOREACH(_elm_win_list, l, obj)
3633 elm_widget_focus_reconfigure(obj); 3633 elm_obj_widget_focus_reconfigure(obj);
3634} 3634}
3635 3635
3636#ifdef HAVE_ELEMENTARY_X 3636#ifdef HAVE_ELEMENTARY_X