-<<<<<<< HEAD
- * @brief Add an object swallowed in an item at the end of the given menu
- * widget
- *
- * @param obj The menu object.
- * @param parent The parent menu item (optional)
- * @param subobj The object to swallow
- * @param func Function called when the user select the item.
- * @param data Data sent by the callback.
- * @return Returns the new item.
- *
- * Add an evas object as an item to the menu.
- */
-EAPI Elm_Object_Item *elm_menu_item_add_object(Evas_Object *obj, Elm_Object_Item *parent, Evas_Object *subobj, Evas_Smart_Cb func, const void *data);
-
-/**
- * @brief Set the icon of a menu item to the standard icon with name @p icon
- *
- * @param it The menu item object.
- * @param icon The icon object to set for the content of @p item
- *
- * Once this icon is set, any previously set icon will be deleted.
- */
-EAPI void elm_menu_item_object_icon_name_set(Elm_Object_Item *it, const char *icon);
-=======