From 5a59d28ba0c2678454fa6f7cfe22a7a952e46cc2 Mon Sep 17 00:00:00 2001 From: barbieri Date: Wed, 29 Oct 2008 19:50:24 +0000 Subject: [PATCH] Return associated object. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/ecore@37316 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/ecore_evas/Ecore_Evas.h | 5 +++-- src/lib/ecore_evas/ecore_evas_util.c | 11 +++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_evas/Ecore_Evas.h b/src/lib/ecore_evas/Ecore_Evas.h index 2e2b276..5ef99f4 100644 --- a/src/lib/ecore_evas/Ecore_Evas.h +++ b/src/lib/ecore_evas/Ecore_Evas.h @@ -307,8 +307,9 @@ EAPI int ecore_evas_ignore_events_get(Ecore_Evas *ee); EAPI void *ecore_evas_window_get(Ecore_Evas *ee); - EAPI int ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_Associate_Flags flags); -EAPI int ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj); +EAPI int ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_Associate_Flags flags); +EAPI int ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj); +EAPI Evas_Object *ecore_evas_object_associate_get(Ecore_Evas *ee); #ifdef __cplusplus } diff --git a/src/lib/ecore_evas/ecore_evas_util.c b/src/lib/ecore_evas/ecore_evas_util.c index 593ac6c..01588b3 100644 --- a/src/lib/ecore_evas/ecore_evas_util.c +++ b/src/lib/ecore_evas/ecore_evas_util.c @@ -312,6 +312,17 @@ ecore_evas_object_dissociate(Ecore_Evas *ee, Evas_Object *obj) return 1; } +EAPI Evas_Object * +ecore_evas_object_associate_get(Ecore_Evas *ee) +{ + if (!ECORE_MAGIC_CHECK(ee, ECORE_MAGIC_EVAS)) + { + ECORE_MAGIC_FAIL(ee, ECORE_MAGIC_EVAS, __FUNCTION__); + return NULL; + } + return _ecore_evas_associate_get(ee); +} + static void _ecore_evas_object_associate(Ecore_Evas *ee, Evas_Object *obj, Ecore_Evas_Object_Associate_Flags flags) { -- 2.7.4