summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--legacy/elementary/ChangeLog6
-rw-r--r--legacy/elementary/NEWS1
-rw-r--r--legacy/elementary/src/lib/elm_main.c6
-rw-r--r--legacy/elementary/src/lib/elm_object_item.h19
-rw-r--r--legacy/elementary/src/lib/elm_removed.h15
-rw-r--r--legacy/elementary/src/lib/elm_widget.c7
-rw-r--r--legacy/elementary/src/lib/elm_widget.h1
7 files changed, 40 insertions, 15 deletions
diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 4c59fdcd50..1695f01d04 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1578,6 +1578,10 @@
1578 1578
1579 * Gengrid: implement selectraise feature. 1579 * Gengrid: implement selectraise feature.
1580 1580
15812013-08-28 DAniel Juyung Seo (SeoZ) 15812013-08-28 Daniel Juyung Seo (SeoZ)
1582 1582
1583 * Bg: Add bg reset feature. 1583 * Bg: Add bg reset feature.
1584
15852013-09-02 ChunEon Park (Hermet)
1586
1587 * Widget: Introduce elm_object_item_object_get() API.
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index c2056f3efb..c6046bd9fc 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -85,6 +85,7 @@ Additions:
85 * Add elm_win_focus_highlight_animate_set/get(). 85 * Add elm_win_focus_highlight_animate_set/get().
86 * Add selectraise feature to gengrid. 86 * Add selectraise feature to gengrid.
87 * Add bg reset feature. 87 * Add bg reset feature.
88 * Add elm_object_item_object_get().
88 89
89Improvements: 90Improvements:
90 91
diff --git a/legacy/elementary/src/lib/elm_main.c b/legacy/elementary/src/lib/elm_main.c
index 2fa2ea0004..9f138b2e2a 100644
--- a/legacy/elementary/src/lib/elm_main.c
+++ b/legacy/elementary/src/lib/elm_main.c
@@ -1859,3 +1859,9 @@ elm_object_item_cursor_engine_only_get(const Elm_Object_Item *it)
1859{ 1859{
1860 return elm_widget_item_cursor_engine_only_get(it); 1860 return elm_widget_item_cursor_engine_only_get(it);
1861} 1861}
1862
1863EAPI const Evas_Object *
1864elm_object_item_object_get(const Elm_Object_Item *it)
1865{
1866 return _elm_widget_item_object_get((Elm_Widget_Item*)it);
1867}
diff --git a/legacy/elementary/src/lib/elm_object_item.h b/legacy/elementary/src/lib/elm_object_item.h
index 8a0ccde906..f256a63640 100644
--- a/legacy/elementary/src/lib/elm_object_item.h
+++ b/legacy/elementary/src/lib/elm_object_item.h
@@ -34,6 +34,25 @@ typedef void (*Elm_Object_Item_Signal_Cb)(void *data, Elm_Objec
34EAPI Evas_Object *elm_object_item_widget_get(const Elm_Object_Item *it); 34EAPI Evas_Object *elm_object_item_widget_get(const Elm_Object_Item *it);
35 35
36/** 36/**
37 * Get the object item's internal object handle.
38 *
39 * @param it The Elementary object item
40 * @return The Internal object of the object item.
41 *
42 * @note This function should only be used if you really need to refer the
43 * internal object's properties (i.e geometry). Since the object items are
44 * managed/controlled by the widget, you should not modify the object directly
45 * nor you should not treat the object without validation.
46 *
47 * Some widget items may return @c NULL for this API if the items @p are not
48 * based on the evas object.
49 *
50 * @since 1.8
51 * @ingroup General
52 */
53EAPI const Evas_Object *elm_object_item_object_get(const Elm_Object_Item *it);
54
55/**
37 * Set a content of an object item 56 * Set a content of an object item
38 * 57 *
39 * @param it The Elementary object item 58 * @param it The Elementary object item
diff --git a/legacy/elementary/src/lib/elm_removed.h b/legacy/elementary/src/lib/elm_removed.h
index 416726a615..59b982f874 100644
--- a/legacy/elementary/src/lib/elm_removed.h
+++ b/legacy/elementary/src/lib/elm_removed.h
@@ -490,19 +490,6 @@ EINA_DEPRECATED EAPI Elm_Gen_Item *elm_gen_item_prev_get(const Elm_Gen_Item *it)
490EINA_DEPRECATED EAPI Evas_Object *elm_gen_item_widget_get(const Elm_Gen_Item *it); 490EINA_DEPRECATED EAPI Evas_Object *elm_gen_item_widget_get(const Elm_Gen_Item *it);
491 491
492/** 492/**
493 * Get the widget object's handle which contains a given item
494 *
495 * @param it The Elementary object item
496 * @return The widget object
497 *
498 * @note This returns the widget object itself that an item belongs to.
499 * @note Every elm_object_item supports this API
500 * @deprecated Use elm_object_item_widget_get() instead
501 * @ingroup General
502 */
503EINA_DEPRECATED EAPI Evas_Object *elm_object_item_object_get(const Elm_Object_Item *it);
504
505/**
506 * Set the text to show in the anchorblock 493 * Set the text to show in the anchorblock
507 * 494 *
508 * Sets the text of the anchorblock to @p text. This text can include markup 495 * Sets the text of the anchorblock to @p text. This text can include markup
@@ -3303,7 +3290,7 @@ EINA_DEPRECATED EAPI void elm_slideshow_show(Elm_Object_Item *i
3303 * 3290 *
3304 * This returns the toolbar object itself that an item belongs to. 3291 * This returns the toolbar object itself that an item belongs to.
3305 * 3292 *
3306 * @deprecated use elm_object_item_object_get() instead. 3293 * @deprecated use elm_object_item_widget_get() instead.
3307 */ 3294 */
3308EINA_DEPRECATED EAPI Evas_Object *elm_toolbar_item_toolbar_get(const Elm_Object_Item *it); 3295EINA_DEPRECATED EAPI Evas_Object *elm_toolbar_item_toolbar_get(const Elm_Object_Item *it);
3309 3296
diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c
index 5f1aae8117..9bcec72ea0 100644
--- a/legacy/elementary/src/lib/elm_widget.c
+++ b/legacy/elementary/src/lib/elm_widget.c
@@ -5771,6 +5771,13 @@ _elm_widget_item_translate(Elm_Widget_Item *item)
5771#endif 5771#endif
5772} 5772}
5773 5773
5774EAPI const Evas_Object *
5775_elm_widget_item_object_get(const Elm_Widget_Item *item)
5776{
5777 ELM_WIDGET_ITEM_CHECK_OR_RETURN(item, NULL);
5778 return item->view;
5779}
5780
5774/* happy debug functions */ 5781/* happy debug functions */
5775#ifdef ELM_DEBUG 5782#ifdef ELM_DEBUG
5776static void 5783static void
diff --git a/legacy/elementary/src/lib/elm_widget.h b/legacy/elementary/src/lib/elm_widget.h
index 945ef9d90b..ef41e1535b 100644
--- a/legacy/elementary/src/lib/elm_widget.h
+++ b/legacy/elementary/src/lib/elm_widget.h
@@ -772,6 +772,7 @@ EAPI void _elm_widget_item_domain_translatable_part_text_set(Elm_Wid
772EAPI const char * _elm_widget_item_translatable_part_text_get(const Elm_Widget_Item *item, const char *part); 772EAPI const char * _elm_widget_item_translatable_part_text_get(const Elm_Widget_Item *item, const char *part);
773EAPI void _elm_widget_item_translate(Elm_Widget_Item *item); 773EAPI void _elm_widget_item_translate(Elm_Widget_Item *item);
774EAPI void _elm_widget_item_domain_part_text_translatable_set(Elm_Widget_Item *item, const char *part, const char *domain, Eina_Bool translatable); 774EAPI void _elm_widget_item_domain_part_text_translatable_set(Elm_Widget_Item *item, const char *part, const char *domain, Eina_Bool translatable);
775EAPI const Evas_Object *_elm_widget_item_object_get(const Elm_Widget_Item *item);
775 776
776/** 777/**
777 * Function to operate on a given widget's scrollabe children when necessary. 778 * Function to operate on a given widget's scrollabe children when necessary.