update for eo_do_ret()
api call change complied with unstable eo.
This commit is contained in:
parent
331ad370d7
commit
a87332c72e
|
@ -56,6 +56,7 @@ AC_SUBST(ENVENTOR_VERSION_MINOR)
|
||||||
|
|
||||||
EFL_ENABLE_EO_API_SUPPORT
|
EFL_ENABLE_EO_API_SUPPORT
|
||||||
EFL_ENABLE_BETA_API_SUPPORT
|
EFL_ENABLE_BETA_API_SUPPORT
|
||||||
|
EFL_ENABLE_EO_LATEST
|
||||||
|
|
||||||
efl_version="1.12.0"
|
efl_version="1.12.0"
|
||||||
requirement_enventor=" \
|
requirement_enventor=" \
|
||||||
|
|
|
@ -4,3 +4,9 @@ AC_DEFUN([EFL_ENABLE_EO_API_SUPPORT],
|
||||||
AC_DEFINE([EFL_EO_API_SUPPORT], [1], [Enable access to unstable EFL Eo API])
|
AC_DEFINE([EFL_EO_API_SUPPORT], [1], [Enable access to unstable EFL Eo API])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
AC_DEFUN([EFL_ENABLE_EO_LATEST],
|
||||||
|
[
|
||||||
|
AC_DEFINE([EO_LATEST], [1], [Enable access to unstable EFL Eo Latest API])
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -296,8 +296,12 @@ view_obj_idler_cb(void *data)
|
||||||
elm_object_part_content_set(vd->base, "elm.swallow.content",
|
elm_object_part_content_set(vd->base, "elm.swallow.content",
|
||||||
vd->layout);
|
vd->layout);
|
||||||
elm_object_content_set(vd->scroller, vd->base);
|
elm_object_content_set(vd->scroller, vd->base);
|
||||||
|
#if EO_LATEST
|
||||||
|
Eina_Bool ret;
|
||||||
|
if (eo_do_ret(vd->enventor, ret, enventor_obj_dummy_swallow_get()))
|
||||||
|
#else
|
||||||
if (eo_do(vd->enventor, enventor_obj_dummy_swallow_get()))
|
if (eo_do(vd->enventor, enventor_obj_dummy_swallow_get()))
|
||||||
|
#endif
|
||||||
dummy_obj_new(vd->layout);
|
dummy_obj_new(vd->layout);
|
||||||
|
|
||||||
vd->idler = NULL;
|
vd->idler = NULL;
|
||||||
|
|
|
@ -579,7 +579,12 @@ enventor_object_add(Evas_Object *parent)
|
||||||
EAPI Eina_Bool
|
EAPI Eina_Bool
|
||||||
enventor_object_file_set(Evas_Object *obj, const char *file)
|
enventor_object_file_set(Evas_Object *obj, const char *file)
|
||||||
{
|
{
|
||||||
|
#if EO_LATEST
|
||||||
|
Eina_Bool ret;
|
||||||
|
return eo_do_ret(obj, ret, efl_file_set(file, NULL));
|
||||||
|
#else
|
||||||
return eo_do(obj, efl_file_set(file, NULL));
|
return eo_do(obj, efl_file_set(file, NULL));
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "enventor_object.eo.c"
|
#include "enventor_object.eo.c"
|
||||||
|
|
Loading…
Reference in New Issue