bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b9b925fba50785619b27db8a13c4ec80b82d73f6
commit b9b925fba50785619b27db8a13c4ec80b82d73f6 Author: Mike Blumenkrantz <[email protected]> Date: Mon Sep 16 14:53:54 2019 -0400 build: use legacy api in places where legacy should be used these seem to randomly have been changed when they shouldn't have also install elm_clock_eo.h since this is required but we didn't install it Reviewed-by: Stefan Schmidt <[email protected]> Differential Revision: https://phab.enlightenment.org/D9971 --- src/bin/elementary/test_datetime.c | 2 +- src/lib/elementary/elm_datetime.h | 3 ++- src/lib/elementary/meson.build | 1 + src/tests/elementary/elm_test_widget_focus.c | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/bin/elementary/test_datetime.c b/src/bin/elementary/test_datetime.c index 719275baca..1b4bd231ee 100644 --- a/src/bin/elementary/test_datetime.c +++ b/src/bin/elementary/test_datetime.c @@ -31,7 +31,7 @@ _bt_clicked(void *data EINA_UNUSED, Evas_Object *obj, void *event_info EINA_UNUS new_time.tm_sec = 0; elm_datetime_field_visible_set(dt1, ELM_DATETIME_HOUR, EINA_TRUE); elm_datetime_field_visible_set(dt1, ELM_DATETIME_MINUTE, EINA_TRUE); - efl_ui_clock_pause_set(dt1, EINA_TRUE); + elm_clock_pause_set(dt1, EINA_TRUE); elm_datetime_value_set(dt1, &new_time); elm_object_disabled_set(dt1, EINA_TRUE); elm_object_disabled_set(obj, EINA_TRUE); diff --git a/src/lib/elementary/elm_datetime.h b/src/lib/elementary/elm_datetime.h index cc47da298d..73855925e1 100644 --- a/src/lib/elementary/elm_datetime.h +++ b/src/lib/elementary/elm_datetime.h @@ -204,6 +204,7 @@ #ifndef _ELM_DATE_TIME_H #define _ELM_DATE_TIME_H +#include <elm_clock_eo.h> typedef enum { ELM_DATETIME_YEAR = 0, /**< Indicates Year field. */ @@ -462,7 +463,7 @@ EAPI Eina_Bool elm_datetime_value_max_set(Evas_Object *obj, const Efl_Time *maxt */ EAPI Eina_Bool elm_datetime_value_max_get(const Evas_Object *obj, Efl_Time *maxtime); -#define ELM_DATETIME_EVENT_CHANGED EFL_UI_CLOCK_EVENT_CHANGED +#define ELM_DATETIME_EVENT_CHANGED ELM_CLOCK_EVENT_CHANGED #endif /** diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index a848f693dc..12e2f04355 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -431,6 +431,7 @@ elementary_pub_headers = [ 'efl_ui_check_eo.h', 'elm_check_legacy.h', 'elm_clock.h', + 'elm_clock_eo.h', 'elm_clock_legacy.h', 'elm_cnp.h', 'elm_colorselector.h', diff --git a/src/tests/elementary/elm_test_widget_focus.c b/src/tests/elementary/elm_test_widget_focus.c index 46814d092b..d41889b86e 100644 --- a/src/tests/elementary/elm_test_widget_focus.c +++ b/src/tests/elementary/elm_test_widget_focus.c @@ -93,7 +93,7 @@ static Evas_Object* _custom_progressbar(Evas_Object *win) { Evas_Object *o = elm_progressbar_add(win); - efl_ui_widget_focus_allow_set(o, EINA_TRUE); + elm_object_focus_allow_set(o, EINA_TRUE); return o; } --
