seoz pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=d9e81284369edad30f9225d86f1959c6901e87d8
commit d9e81284369edad30f9225d86f1959c6901e87d8 Author: Daniel Juyung Seo <[email protected]> Date: Sat Oct 5 16:25:40 2013 +0900 elm_widget.h: support return values for ELM_WIDGET_DATA_GET_OR_RETURN macro. --- src/lib/elm_widget.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h index b67feef..64dc763 100644 --- a/src/lib/elm_widget.h +++ b/src/lib/elm_widget.h @@ -793,16 +793,16 @@ EAPI Eina_List *elm_widget_scrollable_children_get(Evas_Object *obj); EAPI void elm_widget_tree_dump(const Evas_Object *top); EAPI void elm_widget_tree_dot_dump(const Evas_Object *top, FILE *output); -#define ELM_WIDGET_DATA_GET_OR_RETURN(o, ptr) \ +#define ELM_WIDGET_DATA_GET_OR_RETURN(o, ptr, ...) \ Elm_Widget_Smart_Data *ptr; \ - ptr = (o ? \ - eo_data_scope_get(o, ELM_OBJ_WIDGET_CLASS) : \ + ptr = (o ? \ + eo_data_scope_get(o, ELM_OBJ_WIDGET_CLASS) :\ NULL); \ if (!ptr) \ { \ CRITICAL("no widget data for object %p (%s)", \ o, evas_object_type_get(o)); \ - return; \ + return __VA_ARGS__; \ } #define ELM_WIDGET_CHECK(obj) \ --
