From e93a38c9664952d838e6a45b5c3e835f16eaa01d Mon Sep 17 00:00:00 2001 From: Yakov Goldberg Date: Tue, 31 Dec 2013 11:14:41 +0200 Subject: [PATCH] widget, spinner: typo in elm_widget_focus_set() --- legacy/elementary/src/lib/elm_spinner.c | 2 +- legacy/elementary/src/lib/elm_widget.c | 14 +++++++------- legacy/elementary/src/lib/elm_widget.h | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c index e5d2f18ffa..42a1d96eb8 100644 --- a/legacy/elementary/src/lib/elm_spinner.c +++ b/legacy/elementary/src/lib/elm_spinner.c @@ -278,7 +278,7 @@ _entry_toggle_cb(void *data, elm_layout_signal_emit(data, "elm,state,active", "elm"); _entry_show(sd); elm_entry_select_all(sd->ent); - elm_widget_focus_set(sd->ent, 1); + elm_widget_focus_set(sd->ent, EINA_TRUE); sd->entry_visible = EINA_TRUE; } } diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c index eae2b68cd6..eb62a93665 100644 --- a/legacy/elementary/src/lib/elm_widget.c +++ b/legacy/elementary/src/lib/elm_widget.c @@ -3138,16 +3138,16 @@ _elm_widget_signal_callback_del(Eo *obj, void *_pd EINA_UNUSED, va_list *list) EAPI void elm_widget_focus_set(Evas_Object *obj, - int first) + Eina_Bool focus) { ELM_WIDGET_CHECK(obj); - eo_do(obj, elm_wdg_focus_set(first)); + eo_do(obj, elm_wdg_focus_set(focus)); } static void _elm_widget_focus_set(Eo *obj, void *_pd, va_list *list) { - int first = va_arg(*list, int); + Eina_Bool focus = va_arg(*list, int); Elm_Widget_Smart_Data *sd = _pd; @@ -3159,12 +3159,12 @@ _elm_widget_focus_set(Eo *obj, void *_pd, va_list *list) eo_do(obj, elm_wdg_on_focus(NULL)); } - if (first) + if (focus) { if ((_is_focusable(sd->resize_obj)) && (!elm_widget_disabled_get(sd->resize_obj))) { - elm_widget_focus_set(sd->resize_obj, first); + elm_widget_focus_set(sd->resize_obj, focus); } else { @@ -3176,7 +3176,7 @@ _elm_widget_focus_set(Eo *obj, void *_pd, va_list *list) if ((_is_focusable(child)) && (!elm_widget_disabled_get(child))) { - elm_widget_focus_set(child, first); + elm_widget_focus_set(child, focus); break; } } @@ -3192,7 +3192,7 @@ _elm_widget_focus_set(Eo *obj, void *_pd, va_list *list) if ((_is_focusable(child)) && (!elm_widget_disabled_get(child))) { - elm_widget_focus_set(child, first); + elm_widget_focus_set(child, focus); break; } } diff --git a/legacy/elementary/src/lib/elm_widget.h b/legacy/elementary/src/lib/elm_widget.h index 7a9222022d..f9484c30a1 100644 --- a/legacy/elementary/src/lib/elm_widget.h +++ b/legacy/elementary/src/lib/elm_widget.h @@ -645,7 +645,7 @@ EAPI Eina_Bool elm_widget_focus_list_next_get(const Evas_Object *obj, con EAPI Evas_Object *elm_widget_focus_next_object_get(const Evas_Object *obj, Elm_Focus_Direction dir); EAPI void elm_widget_focus_next_object_set(Evas_Object *obj, Evas_Object *next, Elm_Focus_Direction dir); EAPI void elm_widget_parent_highlight_set(Evas_Object *obj, Eina_Bool highlighted); -EAPI void elm_widget_focus_set(Evas_Object *obj, int first); +EAPI void elm_widget_focus_set(Evas_Object *obj, Eina_Bool focus); EAPI void elm_widget_focused_object_clear(Evas_Object *obj); EAPI Evas_Object *elm_widget_parent_get(const Evas_Object *obj); EAPI Evas_Object *elm_widget_parent2_get(const Evas_Object *obj); @@ -1768,10 +1768,10 @@ typedef void * (*list_data_get_func_type)(const Eina_List * l); * * No description supplied by the EAPI. * - * @param[in] first + * @param[in] focus * */ -#define elm_wdg_focus_set(first) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_SET), EO_TYPECHECK(int, first) +#define elm_wdg_focus_set(focus) ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_SET), EO_TYPECHECK(Eina_Bool, focus) /** * @def elm_wdg_focused_object_clear