forked from enlightenment/efl
elm: change elm_object_item_content_part_set/get/unset to elm_object_item_part_content_set/get/unset
SVN revision: 65351
This commit is contained in:
parent
3b1da7df04
commit
9761b693a0
|
@ -98,7 +98,7 @@ _page4(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
|||
elm_app_data_dir_get());
|
||||
elm_icon_file_set(ic, buf, NULL);
|
||||
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
|
||||
elm_object_item_content_part_set(it, "icon", ic);
|
||||
elm_object_item_part_content_set(it, "icon", ic);
|
||||
elm_naviframe_item_title_visible_set(it, EINA_FALSE);
|
||||
evas_object_smart_callback_add(content, "clicked", _title_visible, it);
|
||||
}
|
||||
|
@ -133,7 +133,7 @@ _page3(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
|
|||
elm_icon_file_set(ic, buf, NULL);
|
||||
evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
|
||||
|
||||
elm_object_item_content_part_set(it, "icon", ic);
|
||||
elm_object_item_part_content_set(it, "icon", ic);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
@ -1180,6 +1180,19 @@ extern "C" {
|
|||
*/
|
||||
EAPI Evas_Object *elm_object_item_object_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1);
|
||||
|
||||
/**
|
||||
* Set a content of an object item
|
||||
*
|
||||
* @param it The Elementary object item
|
||||
* @param part The content part name to set (NULL for the default content)
|
||||
* @param content The new content of the object item
|
||||
*
|
||||
* @note Elementary object items may have many contents
|
||||
* @deprecated Use elm_object_item_part_content_set instead.
|
||||
* @ingroup General
|
||||
*/
|
||||
EINA_DEPRECATED EAPI void elm_object_item_content_part_set(Elm_Object_Item *it, const char *part, Evas_Object *content);
|
||||
|
||||
/**
|
||||
* Set a content of an object item
|
||||
*
|
||||
|
@ -1191,9 +1204,22 @@ extern "C" {
|
|||
*
|
||||
* @ingroup General
|
||||
*/
|
||||
EAPI void elm_object_item_content_part_set(Elm_Object_Item *it, const char *part, Evas_Object *content);
|
||||
EAPI void elm_object_item_part_content_set(Elm_Object_Item *it, const char *part, Evas_Object *content);
|
||||
|
||||
#define elm_object_item_content_set(it, content) elm_object_item_content_part_set((it), NULL, (content))
|
||||
#define elm_object_item_content_set(it, content) elm_object_item_part_content_set((it), NULL, (content))
|
||||
|
||||
/**
|
||||
* Get a content of an object item
|
||||
*
|
||||
* @param it The Elementary object item
|
||||
* @param part The content part name to unset (NULL for the default content)
|
||||
* @return content of the object item or NULL for any error
|
||||
*
|
||||
* @note Elementary object items may have many contents
|
||||
* @deprecated Use elm_object_item_part_content_get instead.
|
||||
* @ingroup General
|
||||
*/
|
||||
EAPI Evas_Object *elm_object_item_content_part_get(const Elm_Object_Item *it, const char *part);
|
||||
|
||||
/**
|
||||
* Get a content of an object item
|
||||
|
@ -1206,9 +1232,21 @@ extern "C" {
|
|||
*
|
||||
* @ingroup General
|
||||
*/
|
||||
EAPI Evas_Object *elm_object_item_content_part_get(const Elm_Object_Item *it, const char *part);
|
||||
EAPI Evas_Object *elm_object_item_part_content_get(const Elm_Object_Item *it, const char *part);
|
||||
|
||||
#define elm_object_item_content_get(it) elm_object_item_content_part_get((it), NULL)
|
||||
#define elm_object_item_content_get(it) elm_object_item_part_content_get((it), NULL)
|
||||
|
||||
/**
|
||||
* Unset a content of an object item
|
||||
*
|
||||
* @param it The Elementary object item
|
||||
* @param part The content part name to unset (NULL for the default content)
|
||||
*
|
||||
* @note Elementary object items may have many contents
|
||||
* @deprecated Use elm_object_item_part_content_unset instead.
|
||||
* @ingroup General
|
||||
*/
|
||||
EINA_DEPRECATED EAPI Evas_Object *elm_object_item_content_part_unset(Elm_Object_Item *it, const char *part);
|
||||
|
||||
/**
|
||||
* Unset a content of an object item
|
||||
|
@ -1220,9 +1258,9 @@ extern "C" {
|
|||
*
|
||||
* @ingroup General
|
||||
*/
|
||||
EAPI Evas_Object *elm_object_item_content_part_unset(Elm_Object_Item *it, const char *part);
|
||||
EAPI Evas_Object *elm_object_item_part_content_unset(Elm_Object_Item *it, const char *part);
|
||||
|
||||
#define elm_object_item_content_unset(it) elm_object_item_content_part_unset((it), NULL)
|
||||
#define elm_object_item_content_unset(it) elm_object_item_part_content_unset((it), NULL)
|
||||
|
||||
/**
|
||||
* Set a label of an object item
|
||||
|
@ -26744,7 +26782,7 @@ extern "C" {
|
|||
* @see elm_ctxpopup_item_append()
|
||||
* @see elm_ctxpopup_item_icon_set()
|
||||
*
|
||||
* @deprecated use elm_object_item_content_part_get() instead
|
||||
* @deprecated use elm_object_item_part_content_get() instead
|
||||
*/
|
||||
EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_item_icon_get(const Elm_Object_Item *it) EINA_ARG_NONNULL(1);
|
||||
/**
|
||||
|
@ -26759,7 +26797,7 @@ extern "C" {
|
|||
*
|
||||
* @see elm_ctxpopup_item_append()
|
||||
*
|
||||
* @deprecated use elm_object_item_content_part_set() instead
|
||||
* @deprecated use elm_object_item_part_content_set() instead
|
||||
*
|
||||
*/
|
||||
EINA_DEPRECATED EAPI void elm_ctxpopup_item_icon_set(Elm_Object_Item *it, Evas_Object *icon) EINA_ARG_NONNULL(1);
|
||||
|
|
|
@ -2013,6 +2013,14 @@ elm_object_item_content_part_set(Elm_Object_Item *it,
|
|||
_elm_widget_item_content_part_set((Elm_Widget_Item *) it, part, content);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
elm_object_item_part_content_set(Elm_Object_Item *it,
|
||||
const char *part,
|
||||
Evas_Object *content)
|
||||
{
|
||||
_elm_widget_item_content_part_set((Elm_Widget_Item *) it, part, content);
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
elm_object_item_content_part_get(const Elm_Object_Item *it,
|
||||
const char *part)
|
||||
|
@ -2020,12 +2028,25 @@ elm_object_item_content_part_get(const Elm_Object_Item *it,
|
|||
return _elm_widget_item_content_part_get((Elm_Widget_Item *) it, part);
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
elm_object_item_part_content_get(const Elm_Object_Item *it,
|
||||
const char *part)
|
||||
{
|
||||
return _elm_widget_item_content_part_get((Elm_Widget_Item *) it, part);
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
elm_object_item_content_part_unset(Elm_Object_Item *it, const char *part)
|
||||
{
|
||||
return _elm_widget_item_content_part_unset((Elm_Widget_Item *) it, part);
|
||||
}
|
||||
|
||||
EAPI Evas_Object *
|
||||
elm_object_item_part_content_unset(Elm_Object_Item *it, const char *part)
|
||||
{
|
||||
return _elm_widget_item_content_part_unset((Elm_Widget_Item *) it, part);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
elm_object_item_text_part_set(Elm_Object_Item *it,
|
||||
const char *part,
|
||||
|
|
Loading…
Reference in New Issue