kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename focus method from cycle to next_get 

SVN revision: 53112
This commit is contained in:
Tiago Rezende Campos Falcao 2010-10-06 20:24:13 +00:00
parent c3e3585e83
commit 198ca1fd95
13 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
legacy/elementary/src/lib/elm_box.c
View File

@ -94,7 +94,7 @@ _elm_box_list_data_get(const Eina_List *list)
}
static Eina_Bool
_elm_box_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
_elm_box_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
Widget_Data *wd = elm_widget_data_get(obj);
Eina_List *items;
@ -121,7 +121,7 @@ _elm_box_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object
if (!items) return EINA_FALSE;
}
return elm_widget_focus_cycle_next_get(obj, items, list_data_get, dir, next);
return elm_widget_focus_list_next_get(obj, items, list_data_get, dir, next);
}
static void
@ -351,7 +351,7 @@ elm_box_add(Evas_Object *parent)
elm_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_del_pre_hook_set(obj, _del_pre_hook);
elm_widget_focus_cycle_hook_set(obj, _elm_box_focus_cycle_hook);
elm_widget_focus_next_hook_set(obj, _elm_box_focus_next_hook);
elm_widget_can_focus_set(obj, EINA_FALSE);
elm_widget_highlight_ignore_set(obj, EINA_TRUE);

6
legacy/elementary/src/lib/elm_bubble.c
View File

@ -55,7 +55,7 @@ _theme_hook(Evas_Object *obj)
}
static Eina_Bool
_elm_bubble_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
_elm_bubble_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object *cur;
@ -66,7 +66,7 @@ _elm_bubble_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Obj
cur = wd->content;
/* Try Focus cycle in subitem */
return elm_widget_focus_cycle(cur, dir, next);
return elm_widget_focus_next_get(cur, dir, next);
}
static void
@ -132,7 +132,7 @@ elm_bubble_add(Evas_Object *parent)
elm_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
elm_widget_focus_cycle_hook_set(obj, _elm_bubble_focus_cycle_hook);
elm_widget_focus_next_hook_set(obj, _elm_bubble_focus_next_hook);
elm_widget_can_focus_set(obj, EINA_FALSE);
wd->bbl = edje_object_add(e);

8
legacy/elementary/src/lib/elm_flip.c
View File

@ -59,7 +59,7 @@ _theme_hook(Evas_Object *obj)
}
static Eina_Bool
_elm_flip_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
_elm_flip_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
Widget_Data *wd = elm_widget_data_get(obj);
@ -68,9 +68,9 @@ _elm_flip_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Objec
/* Try Focus cycle in subitem */
if (wd->state)
return elm_widget_focus_cycle(wd->front.content, dir, next);
return elm_widget_focus_next_get(wd->front.content, dir, next);
else
return elm_widget_focus_cycle(wd->back.content, dir, next);
return elm_widget_focus_next_get(wd->back.content, dir, next);
}
@ -414,7 +414,7 @@ elm_flip_add(Evas_Object *parent)
elm_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
elm_widget_focus_cycle_hook_set(obj, _elm_flip_focus_cycle_hook);
elm_widget_focus_next_hook_set(obj, _elm_flip_focus_next_hook);
elm_widget_can_focus_set(obj, EINA_FALSE);
wd->clip = evas_object_rectangle_add(e);

6
legacy/elementary/src/lib/elm_frame.c
View File

@ -47,7 +47,7 @@ _theme_hook(Evas_Object *obj)
}
static Eina_Bool
_elm_frame_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
_elm_frame_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object *cur;
@ -58,7 +58,7 @@ _elm_frame_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Obje
cur = wd->content;
/* Try Focus cycle in subitem */
return elm_widget_focus_cycle(cur, dir, next);
return elm_widget_focus_next_get(cur, dir, next);
}
static void
@ -122,7 +122,7 @@ elm_frame_add(Evas_Object *parent)
elm_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
elm_widget_focus_cycle_hook_set(obj, _elm_frame_focus_cycle_hook);
elm_widget_focus_next_hook_set(obj, _elm_frame_focus_next_hook);
elm_widget_can_focus_set(obj, EINA_FALSE);
wd->frm = edje_object_add(e);

6
legacy/elementary/src/lib/elm_layout.c
View File

@ -93,7 +93,7 @@ _elm_layout_list_data_get(const Eina_List *list)
}
static Eina_Bool
_elm_layout_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
_elm_layout_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
Widget_Data *wd = elm_widget_data_get(obj);
Eina_List *items;
@ -119,7 +119,7 @@ _elm_layout_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Obj
if (!items) return EINA_FALSE;
}
return elm_widget_focus_cycle_next_get(obj, items, list_data_get, dir,
return elm_widget_focus_list_next_get(obj, items, list_data_get, dir,
next);
}
@ -268,7 +268,7 @@ elm_layout_add(Evas_Object *parent)
elm_widget_theme_hook_set(obj, _theme_hook);
elm_widget_changed_hook_set(obj, _changed_hook);
elm_widget_can_focus_set(obj, EINA_FALSE);
elm_widget_focus_cycle_hook_set(obj, _elm_layout_focus_cycle_hook);
elm_widget_focus_next_hook_set(obj, _elm_layout_focus_next_hook);
wd->lay = edje_object_add(e);
elm_widget_resize_object_set(obj, wd->lay);

6
legacy/elementary/src/lib/elm_pager.c
View File

@ -66,7 +66,7 @@ _theme_hook(Evas_Object *obj)
}
static Eina_Bool
_elm_pager_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
_elm_pager_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object *cur;
@ -77,7 +77,7 @@ _elm_pager_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Obje
cur = wd->top->content;
/* Try Focus cycle in subitem */
return elm_widget_focus_cycle(cur, dir, next);
return elm_widget_focus_next_get(cur, dir, next);
}
static void
@ -239,7 +239,7 @@ elm_pager_add(Evas_Object *parent)
elm_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
elm_widget_focus_cycle_hook_set(obj, _elm_pager_focus_cycle_hook);
elm_widget_focus_next_hook_set(obj, _elm_pager_focus_next_hook);
elm_widget_can_focus_set(obj, EINA_FALSE);
wd->clip = evas_object_rectangle_add(e);

6
legacy/elementary/src/lib/elm_panel.c
View File

@ -78,7 +78,7 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
}
static Eina_Bool
_elm_panel_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
_elm_panel_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object *cur;
@ -90,7 +90,7 @@ _elm_panel_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Obje
/* Try Focus cycle in subitem */
if (!wd->hidden)
return elm_widget_focus_cycle(cur, dir, next);
return elm_widget_focus_next_get(cur, dir, next);
/* Return */
*next = obj;
@ -251,7 +251,7 @@ elm_panel_add(Evas_Object *parent)
elm_widget_signal_emit_hook_set(obj, _signal_emit_hook);
elm_widget_signal_callback_add_hook_set(obj, _signal_callback_add_hook);
elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook);
elm_widget_focus_cycle_hook_set(obj, _elm_panel_focus_cycle_hook);
elm_widget_focus_next_hook_set(obj, _elm_panel_focus_next_hook);
elm_widget_can_focus_set(obj, EINA_TRUE);
elm_widget_event_hook_set(obj, _event_hook);

14
legacy/elementary/src/lib/elm_panes.c
View File

@ -70,7 +70,7 @@ _theme_hook(Evas_Object *obj)
}
static Eina_Bool
_elm_panes_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
_elm_panes_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
Widget_Data *wd = elm_widget_data_get(obj);
@ -80,7 +80,7 @@ _elm_panes_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Obje
double w, h;
edje_object_part_drag_value_get(wd->panes, "elm.bar", &w, &h);
if ((wd->horizontal && ( h == 0.0 )) || ((!wd->horizontal) && ( w == 0.0 )))
return elm_widget_focus_cycle(wd->contents.right, dir, next);
return elm_widget_focus_next_get(wd->contents.right, dir, next);
Evas_Object *chain[2];
@ -101,9 +101,9 @@ _elm_panes_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Obje
if (elm_widget_focus_get(chain[1]))
{
Evas_Object *to_focus;
if (elm_widget_focus_cycle(chain[1], dir, next))
if (elm_widget_focus_next_get(chain[1], dir, next))
return EINA_TRUE;
elm_widget_focus_cycle(chain[0], dir, &to_focus);
elm_widget_focus_next_get(chain[0], dir, &to_focus);
if (to_focus)
*next = to_focus;
return EINA_FALSE;
@ -111,9 +111,9 @@ _elm_panes_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Obje
else
{
Evas_Object *to_focus;
if (elm_widget_focus_cycle(chain[0], dir, next))
if (elm_widget_focus_next_get(chain[0], dir, next))
return EINA_TRUE;
if (elm_widget_focus_cycle(chain[1], dir, &to_focus))
if (elm_widget_focus_next_get(chain[1], dir, &to_focus))
{
*next = to_focus;
return EINA_TRUE;
@ -217,7 +217,7 @@ elm_panes_add(Evas_Object *parent)
elm_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_theme_hook_set(obj, _theme_hook);
elm_widget_focus_cycle_hook_set(obj, _elm_panes_focus_cycle_hook);
elm_widget_focus_next_hook_set(obj, _elm_panes_focus_next_hook);
elm_widget_can_focus_set(obj, EINA_FALSE);
wd->panes = edje_object_add(e);

6
legacy/elementary/src/lib/elm_scroller.c
View File

@ -198,7 +198,7 @@ _theme_hook(Evas_Object *obj)
}
static Eina_Bool
_elm_scroller_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
_elm_scroller_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object *cur;
@ -210,7 +210,7 @@ _elm_scroller_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_O
/* Try Focus cycle in subitem */
if (elm_widget_can_focus_get(cur) || elm_widget_child_can_focus_get(cur))
return elm_widget_focus_cycle(cur, dir, next);
return elm_widget_focus_next_get(cur, dir, next);
/* Return */
*next = obj;
@ -446,7 +446,7 @@ elm_scroller_add(Evas_Object *parent)
elm_widget_signal_emit_hook_set(obj, _signal_emit_hook);
elm_widget_signal_callback_add_hook_set(obj, _signal_callback_add_hook);
elm_widget_signal_callback_del_hook_set(obj, _signal_callback_del_hook);
elm_widget_focus_cycle_hook_set(obj, _elm_scroller_focus_cycle_hook);
elm_widget_focus_next_hook_set(obj, _elm_scroller_focus_next_hook);
elm_widget_can_focus_set(obj, EINA_TRUE);
elm_widget_event_hook_set(obj, _event_hook);

6
legacy/elementary/src/lib/elm_table.c
View File

@ -41,7 +41,7 @@ _del_hook(Evas_Object *obj)
}
static Eina_Bool
_elm_table_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
_elm_table_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
Widget_Data *wd = elm_widget_data_get(obj);
Eina_List *items;
@ -70,7 +70,7 @@ _elm_table_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Obje
if (!items) return EINA_FALSE;
}
Eina_Bool ret = elm_widget_focus_cycle_next_get(obj, items, list_data_get,
Eina_Bool ret = elm_widget_focus_list_next_get(obj, items, list_data_get,
dir, next);
if (list_free)
@ -142,7 +142,7 @@ elm_table_add(Evas_Object *parent)
elm_widget_data_set(obj, wd);
elm_widget_del_hook_set(obj, _del_hook);
elm_widget_del_pre_hook_set(obj, _del_pre_hook);
elm_widget_focus_cycle_hook_set(obj, _elm_table_focus_cycle_hook);
elm_widget_focus_next_hook_set(obj, _elm_table_focus_next_hook);
elm_widget_can_focus_set(obj, EINA_FALSE);
elm_widget_highlight_ignore_set(obj, EINA_FALSE);

21
legacy/elementary/src/lib/elm_widget.c
View File

@ -40,9 +40,8 @@ struct _Smart_Data
Evas_Object *o, const char *emission,
const char *source));
void (*changed_func) (Evas_Object *obj);
Eina_Bool (*focus_cycle_func) (Evas_Object *obj,
Elm_Focus_Direction dir,
Evas_Object **next);
Eina_Bool (*focus_next_func) (Evas_Object *obj, Elm_Focus_Direction dir,
Evas_Object **next);
void (*on_focus_func) (void *data, Evas_Object *obj);
void *on_focus_data;
void (*on_change_func) (void *data, Evas_Object *obj);
@ -405,10 +404,10 @@ elm_widget_theme(Evas_Object *obj)
}
EAPI void
elm_widget_focus_cycle_hook_set(Evas_Object *obj, Eina_Bool (*func) (Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next))
elm_widget_focus_next_hook_set(Evas_Object *obj, Eina_Bool (*func) (Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next))
{
API_ENTRY return;
sd->focus_cycle_func = func;
sd->focus_next_func = func;
}
EAPI void
@ -751,7 +750,7 @@ elm_widget_parent_event_propagate(Evas_Object *obj, Evas_Callback_Type type, voi
}
EAPI Eina_Bool
elm_widget_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
elm_widget_focus_next_get(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
if (!next)
return EINA_FALSE;
@ -764,8 +763,8 @@ elm_widget_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **
return EINA_FALSE;
/* Try use hook */
if (sd->focus_cycle_func)
return sd->focus_cycle_func(obj, dir, next);
if (sd->focus_next_func)
return sd->focus_next_func(obj, dir, next);
if (!elm_widget_can_focus_get(obj))
return EINA_FALSE;
@ -776,7 +775,7 @@ elm_widget_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **
}
EAPI Eina_Bool
elm_widget_focus_cycle_next_get(Evas_Object *obj, Eina_List *items, void *(*list_data_get) (const Eina_List *list), Elm_Focus_Direction dir, Evas_Object **next)
elm_widget_focus_list_next_get(Evas_Object *obj, Eina_List *items, void *(*list_data_get) (const Eina_List *list), Elm_Focus_Direction dir, Evas_Object **next)
{
Eina_List *(*list_next) (const Eina_List *list);
@ -825,7 +824,7 @@ elm_widget_focus_cycle_next_get(Evas_Object *obj, Eina_List *items, void *(*list
Evas_Object *cur = list_data_get(l);
/* Try Focus cycle in subitem */
if (elm_widget_focus_cycle(cur, dir, &tmp))
if (elm_widget_focus_next_get(cur, dir, &tmp))
{
*next = tmp;
return EINA_TRUE;
@ -843,7 +842,7 @@ elm_widget_focus_cycle_next_get(Evas_Object *obj, Eina_List *items, void *(*list
Evas_Object *cur = list_data_get(l);
/* Try Focus cycle in subitem */
elm_widget_focus_cycle(cur, dir, &tmp);
elm_widget_focus_next_get(cur, dir, &tmp);
if (tmp)
{
*next = tmp;

6
legacy/elementary/src/lib/elm_widget.h
View File

@ -225,7 +225,7 @@ EAPI void elm_widget_signal_emit_hook_set(Evas_Object *obj, void (*f
EAPI void elm_widget_signal_callback_add_hook_set(Evas_Object *obj, void (*func) (Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source), void *data));
EAPI void elm_widget_signal_callback_del_hook_set(Evas_Object *obj, void *(*func) (Evas_Object *obj, const char *emission, const char *source, void (*func_cb) (void *data, Evas_Object *o, const char *emission, const char *source)));
EAPI void elm_widget_theme(Evas_Object *obj);
EAPI void elm_widget_focus_cycle_hook_set(Evas_Object *obj, Eina_Bool (*func) (Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next));
EAPI void elm_widget_focus_next_hook_set(Evas_Object *obj, Eina_Bool (*func) (Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next));
EAPI void elm_widget_on_focus_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
EAPI void elm_widget_on_change_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
EAPI void elm_widget_on_show_region_hook_set(Evas_Object *obj, void (*func) (void *data, Evas_Object *obj), void *data);
@ -251,8 +251,8 @@ EAPI Evas_Object *elm_widget_top_get(const Evas_Object *obj);
EAPI Eina_Bool elm_widget_is(const Evas_Object *obj);
EAPI Evas_Object *elm_widget_parent_widget_get(const Evas_Object *obj);
EAPI Eina_Bool elm_widget_parent_event_propagate(Evas_Object *obj, Evas_Callback_Type type, void *event_info);
EAPI Eina_Bool elm_widget_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next);
EAPI Eina_Bool elm_widget_focus_cycle_next_get(Evas_Object *obj, Eina_List *items, void *(*list_data_get) (const Eina_List *list), Elm_Focus_Direction dir, Evas_Object **next);
EAPI Eina_Bool elm_widget_focus_next_get(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next);
EAPI Eina_Bool elm_widget_focus_list_next_get(Evas_Object *obj, Eina_List *items, void *(*list_data_get) (const Eina_List *list), Elm_Focus_Direction dir, Evas_Object **next);
EAPI int elm_widget_focus_jump(Evas_Object *obj, int forward);
EAPI void elm_widget_focus_set(Evas_Object *obj, int first);
EAPI void elm_widget_focused_object_clear(Evas_Object *obj);

16
legacy/elementary/src/lib/elm_win.c
View File

@ -136,7 +136,7 @@ _elm_win_focus_out(Ecore_Evas *ee)
}
static Eina_Bool
_elm_win_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
_elm_win_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
Elm_Win *wd = elm_widget_data_get(obj);
Eina_List *items;
@ -150,7 +150,7 @@ _elm_win_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object
items = wd->subobjs;
list_data_get = eina_list_data_get;
elm_widget_focus_cycle_next_get(obj, items, list_data_get, dir, next);
elm_widget_focus_list_next_get(obj, items, list_data_get, dir, next);
if (*next)
return EINA_TRUE;
@ -167,9 +167,9 @@ _elm_win_event_cb(Evas_Object *obj, Evas_Object *src, Evas_Callback_Type type, v
{
Evas_Object *target;
if(evas_key_modifier_is_set(ev->modifiers, "Shift"))
elm_widget_focus_cycle(obj, ELM_FOCUS_PREVIOUS, &target);
elm_widget_focus_next_get(obj, ELM_FOCUS_PREVIOUS, &target);
else
elm_widget_focus_cycle(obj, ELM_FOCUS_NEXT, &target);
elm_widget_focus_next_get(obj, ELM_FOCUS_NEXT, &target);
if (target)
elm_widget_focus_steal(target);
return EINA_TRUE;
@ -987,7 +987,7 @@ elm_win_add(Evas_Object *parent, const char *name, Elm_Win_Type type)
elm_widget_event_hook_set(win->win_obj, _elm_win_event_cb);
elm_widget_can_focus_set(win->win_obj, EINA_TRUE);
elm_widget_highlight_ignore_set(win->win_obj, EINA_TRUE);
elm_widget_focus_cycle_hook_set(win->win_obj, _elm_win_focus_cycle_hook);
elm_widget_focus_next_hook_set(win->win_obj, _elm_win_focus_next_hook);
evas_object_color_set(win->win_obj, 0, 0, 0, 0);
evas_object_move(win->win_obj, 0, 0);
evas_object_resize(win->win_obj, 1, 1);
@ -2126,7 +2126,7 @@ _theme_hook(Evas_Object *obj)
}
static Eina_Bool
_elm_inwin_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
_elm_inwin_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
{
Widget_Data *wd = elm_widget_data_get(obj);
Evas_Object *cur;
@ -2137,7 +2137,7 @@ _elm_inwin_focus_cycle_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Obje
cur = wd->content;
/* Try Focus cycle in subitem */
elm_widget_focus_cycle(cur, dir, next);
elm_widget_focus_next_get(cur, dir, next);
if (*next)
return EINA_TRUE;
return EINA_FALSE;
@ -2202,7 +2202,7 @@ elm_win_inwin_add(Evas_Object *obj)
elm_widget_data_set(obj2, wd);
elm_widget_del_hook_set(obj2, _del_hook);
elm_widget_theme_hook_set(obj2, _theme_hook);
elm_widget_focus_cycle_hook_set(obj2, _elm_inwin_focus_cycle_hook);
elm_widget_focus_next_hook_set(obj2, _elm_inwin_focus_next_hook);
elm_widget_can_focus_set(obj2, EINA_FALSE);
wd->frm = edje_object_add(win->evas);