From: Daniel Juyung Seo Date: Sat, 5 Oct 2013 08:15:27 +0000 (+0900) Subject: elm_scroller.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro. X-Git-Tag: upstream/1.20.0~7116^2~14^2~3978^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b101a10f12879b2b3df5cd5c859eeb1d650e025;p=platform%2Fupstream%2Fefl.git elm_scroller.c: adopted ELM_WIDGET_DATA_GET_OR_RETURN macro. --- diff --git a/legacy/elementary/src/lib/elm_scroller.c b/legacy/elementary/src/lib/elm_scroller.c index 5dce8f7..52b575e 100644 --- a/legacy/elementary/src/lib/elm_scroller.c +++ b/legacy/elementary/src/lib/elm_scroller.c @@ -319,7 +319,7 @@ _elm_scroller_smart_sizing_eval(Eo *obj, void *_pd, va_list *list EINA_UNUSED) double xw = 0.0, yw = 0.0; Elm_Scroller_Smart_Data *sd = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); if (sd->content) { @@ -745,7 +745,7 @@ static void _elm_scroller_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED) { Elm_Scroller_Smart_Data *priv = _pd; - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); Evas_Coord minw, minh; eo_do_super(obj, MY_CLASS, evas_obj_smart_add()); @@ -1238,7 +1238,7 @@ static void _propagate_events_set(Eo *obj, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool propagation = va_arg(*list, int); - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); evas_object_propagate_events_set(wd->resize_obj, propagation); } @@ -1257,7 +1257,7 @@ static void _propagate_events_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list) { Eina_Bool *ret = va_arg(*list, Eina_Bool *); - Elm_Widget_Smart_Data *wd = eo_data_scope_get(obj, ELM_OBJ_WIDGET_CLASS); + ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); *ret = evas_object_propagate_events_get(wd->resize_obj); }