From ef8d53f1c81b60f609d936bb9d058c6a431b0cf8 Mon Sep 17 00:00:00 2001 From: shilpa onkar singh Date: Fri, 18 Feb 2011 11:35:32 +0530 Subject: [PATCH] Merge Conflict resolved. [elm_conform]: review comments fixed for popup changes Change-Id: I4382344ddf16e05250472fb0700c7db4b6e5d5b7 --- src/lib/Elementary.h.in | 1 + src/lib/elm_conform.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index df9475a..6a0766a 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -2379,6 +2379,7 @@ extern "C" { EAPI void elm_conformant_content_set(Evas_Object *obj, Evas_Object *content) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_conformant_content_get(const Evas_Object *obj) EINA_ARG_NONNULL(1); EAPI Evas_Object *elm_conformant_content_unset(Evas_Object *obj) EINA_ARG_NONNULL(1); + EAPI Evas_Object *elm_conformant_content_area_get(Evas_Object *obj); EINA_ARG_NONNULL(1); /* mapbuf */ EAPI Evas_Object *elm_mapbuf_add(Evas_Object *parent) EINA_ARG_NONNULL(1); diff --git a/src/lib/elm_conform.c b/src/lib/elm_conform.c index 2994fff..613cbf3 100644 --- a/src/lib/elm_conform.c +++ b/src/lib/elm_conform.c @@ -512,3 +512,23 @@ elm_conformant_content_unset(Evas_Object *obj) wd->content = NULL; return content; } + +/** + * Returns the Evas_Object that represents the content area. + * + * @param obj The conformant object. + * @return The content area of the widget. + * + * @ingroup Conformant + */ +EAPI Evas_Object* +elm_conformant_content_area_get(Evas_Object *obj) +{ + ELM_CHECK_WIDTYPE(obj, widtype); + Widget_Data *wd = elm_widget_data_get(obj); + if (!wd) return; + /*Finger waggle warning*/ + _elm_dangerous_call_check(__FUNCTION__); + return edje_object_part_object_get(wd->base, "elm.swallow.content"); +} + -- 2.7.4