Set const where need in focus_next_get functions set
SVN revision: 53114
This commit is contained in:
parent
434ed6e093
commit
ef18ffa4f4
|
@ -94,10 +94,10 @@ _elm_box_list_data_get(const Eina_List *list)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_elm_box_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
_elm_box_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Eina_List *items;
|
||||
const Eina_List *items;
|
||||
void *(*list_data_get) (const Eina_List *list);
|
||||
|
||||
if ((!wd) || (!wd->box))
|
||||
|
|
|
@ -55,7 +55,7 @@ _theme_hook(Evas_Object *obj)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_elm_bubble_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
_elm_bubble_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Object *cur;
|
||||
|
|
|
@ -59,7 +59,7 @@ _theme_hook(Evas_Object *obj)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_elm_flip_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
_elm_flip_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ _theme_hook(Evas_Object *obj)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_elm_frame_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
_elm_frame_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Object *cur;
|
||||
|
|
|
@ -93,10 +93,10 @@ _elm_layout_list_data_get(const Eina_List *list)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_elm_layout_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
_elm_layout_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Eina_List *items;
|
||||
const Eina_List *items;
|
||||
void *(*list_data_get) (const Eina_List *list);
|
||||
|
||||
if ((!wd) || (!wd->subs))
|
||||
|
|
|
@ -66,7 +66,7 @@ _theme_hook(Evas_Object *obj)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_elm_pager_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
_elm_pager_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Object *cur;
|
||||
|
|
|
@ -78,7 +78,7 @@ _on_focus_hook(void *data __UNUSED__, Evas_Object *obj)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_elm_panel_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
_elm_panel_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Object *cur;
|
||||
|
@ -93,7 +93,7 @@ _elm_panel_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Objec
|
|||
return elm_widget_focus_next_get(cur, dir, next);
|
||||
|
||||
/* Return */
|
||||
*next = obj;
|
||||
*next = (Evas_Object *)obj;
|
||||
return !elm_widget_focus_get(obj);
|
||||
}
|
||||
|
||||
|
|
|
@ -70,7 +70,7 @@ _theme_hook(Evas_Object *obj)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_elm_panes_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
_elm_panes_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
|
||||
|
|
|
@ -198,7 +198,7 @@ _theme_hook(Evas_Object *obj)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_elm_scroller_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
_elm_scroller_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Object *cur;
|
||||
|
@ -213,7 +213,7 @@ _elm_scroller_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Ob
|
|||
return elm_widget_focus_next_get(cur, dir, next);
|
||||
|
||||
/* Return */
|
||||
*next = obj;
|
||||
*next = (Evas_Object *)obj;
|
||||
return !elm_widget_focus_get(obj);
|
||||
}
|
||||
|
||||
|
|
|
@ -41,10 +41,10 @@ _del_hook(Evas_Object *obj)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_elm_table_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
_elm_table_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Eina_List *items;
|
||||
const Eina_List *items;
|
||||
void *(*list_data_get) (const Eina_List *list);
|
||||
Eina_List *(*list_free) (Eina_List *list);
|
||||
|
||||
|
@ -74,7 +74,7 @@ _elm_table_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Objec
|
|||
dir, next);
|
||||
|
||||
if (list_free)
|
||||
items = list_free(items);
|
||||
items = list_free((Eina_List *)items);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -40,7 +40,7 @@ struct _Smart_Data
|
|||
Evas_Object *o, const char *emission,
|
||||
const char *source));
|
||||
void (*changed_func) (Evas_Object *obj);
|
||||
Eina_Bool (*focus_next_func) (Evas_Object *obj, Elm_Focus_Direction dir,
|
||||
Eina_Bool (*focus_next_func) (const Evas_Object *obj, Elm_Focus_Direction dir,
|
||||
Evas_Object **next);
|
||||
void (*on_focus_func) (void *data, Evas_Object *obj);
|
||||
void *on_focus_data;
|
||||
|
@ -404,7 +404,7 @@ elm_widget_theme(Evas_Object *obj)
|
|||
}
|
||||
|
||||
EAPI void
|
||||
elm_widget_focus_next_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) (const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next))
|
||||
{
|
||||
API_ENTRY return;
|
||||
sd->focus_next_func = func;
|
||||
|
@ -759,7 +759,7 @@ elm_widget_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir)
|
|||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
elm_widget_focus_next_get(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
elm_widget_focus_next_get(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
if (!next)
|
||||
return EINA_FALSE;
|
||||
|
@ -779,12 +779,12 @@ elm_widget_focus_next_get(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object
|
|||
return EINA_FALSE;
|
||||
|
||||
/* Return */
|
||||
*next = obj;
|
||||
*next = (Evas_Object *)obj;
|
||||
return !elm_widget_focus_get(obj);
|
||||
}
|
||||
|
||||
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)
|
||||
elm_widget_focus_list_next_get(const Evas_Object *obj, const 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);
|
||||
|
||||
|
@ -809,7 +809,7 @@ elm_widget_focus_list_next_get(Evas_Object *obj, Eina_List *items, void *(*list_
|
|||
else
|
||||
return EINA_FALSE;
|
||||
|
||||
Eina_List *l = items;
|
||||
const Eina_List *l = items;
|
||||
|
||||
/* Recovery last focused sub item */
|
||||
if (elm_widget_focus_get(obj))
|
||||
|
@ -822,7 +822,7 @@ elm_widget_focus_list_next_get(Evas_Object *obj, Eina_List *items, void *(*list_
|
|||
}
|
||||
}
|
||||
|
||||
Eina_List *start = l;
|
||||
const Eina_List *start = l;
|
||||
Evas_Object *to_focus = NULL;
|
||||
|
||||
/* Interate sub items */
|
||||
|
|
|
@ -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_next_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) (const 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);
|
||||
|
@ -252,8 +252,8 @@ 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 void elm_widget_focus_cycle(Evas_Object *obj, Elm_Focus_Direction dir);
|
||||
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 Eina_Bool elm_widget_focus_next_get(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next);
|
||||
EAPI Eina_Bool elm_widget_focus_list_next_get(const Evas_Object *obj, const 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);
|
||||
|
|
|
@ -136,10 +136,10 @@ _elm_win_focus_out(Ecore_Evas *ee)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_elm_win_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
_elm_win_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
Elm_Win *wd = elm_widget_data_get(obj);
|
||||
Eina_List *items;
|
||||
const Eina_List *items;
|
||||
void *(*list_data_get) (const Eina_List *list);
|
||||
|
||||
if ((!wd) || (!wd->subobjs))
|
||||
|
@ -2123,7 +2123,7 @@ _theme_hook(Evas_Object *obj)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_elm_inwin_focus_next_hook(Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
_elm_inwin_focus_next_hook(const Evas_Object *obj, Elm_Focus_Direction dir, Evas_Object **next)
|
||||
{
|
||||
Widget_Data *wd = elm_widget_data_get(obj);
|
||||
Evas_Object *cur;
|
||||
|
|
Loading…
Reference in New Issue