From 8a0e50915637bbe78caa9cdac96f0ea1daa5f974 Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Fri, 6 Feb 2015 00:45:13 +0900 Subject: [PATCH] cnp, scroller: fix build break. This's been caused by efl interface change. current evas_obj inherits efl_gfx_base. Change-Id: I472debdb21939ad212723d61b40becef275f678b --- src/lib/elm_cnp.c | 4 ++-- src/lib/elm_scroller.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/elm_cnp.c b/src/lib/elm_cnp.c index 363d851..fade3b7 100644 --- a/src/lib/elm_cnp.c +++ b/src/lib/elm_cnp.c @@ -4106,7 +4106,7 @@ _elm_item_container_pos_cb(void *data, Evas_Object *obj, Evas_Coord x, Evas_Coor { /* Call container drop func with specific item pointer */ int xo = 0; int yo = 0; - eo_do(obj, evas_obj_position_get(&xo, &yo)); + eo_do(obj, efl_gfx_position_get(&xo, &yo)); if (st->itemgetcb) it = st->itemgetcb(obj, x+xo, y+yo, &xposret, &yposret); @@ -4128,7 +4128,7 @@ _elm_item_container_drop_cb(void *data, Evas_Object *obj , Elm_Selection_Data *e { /* Call container drop func with specific item pointer */ int xo = 0; int yo = 0; - eo_do(obj, evas_obj_position_get(&xo, &yo)); + eo_do(obj, efl_gfx_position_get(&xo, &yo)); if (st->itemgetcb) it = st->itemgetcb(obj, ev->x+xo, ev->y+yo, &xposret, &yposret); diff --git a/src/lib/elm_scroller.c b/src/lib/elm_scroller.c index f9825a1..0ec19f1 100644 --- a/src/lib/elm_scroller.c +++ b/src/lib/elm_scroller.c @@ -110,8 +110,8 @@ _key_action_move(Evas_Object *obj, const char *params) elm_interface_scrollable_content_viewport_geometry_get (NULL, NULL, &v_w, &v_h)); eo_do(sd->content, - evas_obj_position_get(&c_x, &c_y), - evas_obj_size_get(&max_x, &max_y)); + efl_gfx_position_get(&c_x, &c_y), + efl_gfx_size_get(&max_x, &max_y)); current_focus = elm_widget_focused_object_get(obj); evas_object_geometry_get(current_focus, &f_x, &f_y, &f_w, &f_h); -- 2.7.4