From f2a914c1be4e6751bf1183f871ffade4afdf446a Mon Sep 17 00:00:00 2001 From: ChunEon Park Date: Mon, 16 Jan 2012 03:23:32 +0000 Subject: [PATCH] elementary - rename an API elm_object_item_object_get -> elm_object_item_widget_get SVN revision: 67235 --- legacy/elementary/src/lib/elm_deprecated.h | 13 +++++++++++++ legacy/elementary/src/lib/elm_main.c | 9 +++++++-- legacy/elementary/src/lib/elm_menu.c | 2 +- legacy/elementary/src/lib/elm_object_item.h | 2 +- legacy/elementary/src/lib/elm_toolbar.c | 2 +- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/legacy/elementary/src/lib/elm_deprecated.h b/legacy/elementary/src/lib/elm_deprecated.h index 260b805c5f..5422ec4e9f 100644 --- a/legacy/elementary/src/lib/elm_deprecated.h +++ b/legacy/elementary/src/lib/elm_deprecated.h @@ -21,6 +21,19 @@ EINA_DEPRECATED EAPI Elm_Gen_Item *elm_gen_item_next_get(const Elm_Gen_Item *it) EINA_DEPRECATED EAPI Elm_Gen_Item *elm_gen_item_prev_get(const Elm_Gen_Item *it); EINA_DEPRECATED EAPI Evas_Object *elm_gen_item_widget_get(const Elm_Gen_Item *it); +/** + * Get the widget object's handle which contains a given item + * + * @param it The Elementary object item + * @return The widget object + * + * @note This returns the widget object itself that an item belongs to. + * @note Every elm_object_item supports this API + * @deprecated Use elm_object_item_widget_get() instead + * @ingroup General + */ +EINA_DEPRECATED EAPI Evas_Object *elm_object_item_object_get(const Elm_Object_Item *it); + /** * @defgroup Toggle Toggle * diff --git a/legacy/elementary/src/lib/elm_main.c b/legacy/elementary/src/lib/elm_main.c index 9d12f3e3e0..d9e595ea15 100644 --- a/legacy/elementary/src/lib/elm_main.c +++ b/legacy/elementary/src/lib/elm_main.c @@ -2008,9 +2008,9 @@ elm_longpress_timeout_get(void) } EAPI Evas_Object * -elm_object_item_object_get(const Elm_Object_Item *it) +elm_object_item_widget_get(const Elm_Object_Item *it) { - return ((Elm_Widget_Item *) it)->widget; + return WIDGET(it); } EAPI void @@ -2181,3 +2181,8 @@ elm_object_item_tooltip_style_get(const Elm_Object_Item *item) return elm_widget_item_tooltip_style_get(item); } +EINA_DEPRECATED EAPI Evas_Object * +elm_object_item_object_get(const Elm_Object_Item *it) +{ + return elm_object_item_widget_get(it); +} diff --git a/legacy/elementary/src/lib/elm_menu.c b/legacy/elementary/src/lib/elm_menu.c index f4ef091f8e..b2d6ba43b3 100644 --- a/legacy/elementary/src/lib/elm_menu.c +++ b/legacy/elementary/src/lib/elm_menu.c @@ -1036,7 +1036,7 @@ elm_menu_item_next_get(const Elm_Object_Item *it) EAPI Evas_Object * elm_menu_item_menu_get(const Elm_Object_Item *it) { - return elm_object_item_object_get(it); + return elm_object_item_widget_get(it); } EAPI Elm_Object_Item * diff --git a/legacy/elementary/src/lib/elm_object_item.h b/legacy/elementary/src/lib/elm_object_item.h index f7911bec4e..ccd0d62d2f 100644 --- a/legacy/elementary/src/lib/elm_object_item.h +++ b/legacy/elementary/src/lib/elm_object_item.h @@ -8,7 +8,7 @@ * @note Every elm_object_item supports this API * @ingroup General */ -EAPI Evas_Object *elm_object_item_object_get(const Elm_Object_Item *it); +EAPI Evas_Object *elm_object_item_widget_get(const Elm_Object_Item *it); /** * Set a content of an object item diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c index b31285aa72..7de897b841 100644 --- a/legacy/elementary/src/lib/elm_toolbar.c +++ b/legacy/elementary/src/lib/elm_toolbar.c @@ -1259,7 +1259,7 @@ EAPI Evas_Object * elm_toolbar_item_toolbar_get(const Elm_Object_Item *it) { ELM_OBJ_ITEM_CHECK_OR_RETURN(it, NULL); - return elm_object_item_object_get(it); + return elm_object_item_widget_get(it); } EAPI void