remove elm ctx popup's code related with deprecated function

SVN revision: 68452

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 7cdd179..191f3e1 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1372,30 +1372,6 @@ elm_ctxpopup_add(Evas_Object *parent)
    return obj;
 }
 
-EAPI Evas_Object *
-elm_ctxpopup_item_icon_get(const Elm_Object_Item *it)
-{
-   return _item_content_get_hook(it, "icon");
-}
-
-EAPI void
-elm_ctxpopup_item_icon_set(Elm_Object_Item *it, Evas_Object *icon)
-{
-   _item_content_set_hook(it, "icon", icon);
-}
-
-EAPI const char *
-elm_ctxpopup_item_label_get(const Elm_Object_Item *it)
-{
-   return _item_text_get_hook(it, NULL);
-}
-
-EAPI void
-elm_ctxpopup_item_label_set(Elm_Object_Item *it, const char *label)
-{
-   _item_text_set_hook(it, NULL, label);
-}
-
 EAPI void
 elm_ctxpopup_hover_parent_set(Evas_Object *obj, Evas_Object *parent)
 {
@@ -1565,36 +1541,6 @@ elm_ctxpopup_item_append(Evas_Object *obj, const char *label,
 }
 
 EAPI void
-elm_ctxpopup_item_del(Elm_Object_Item *it)
-{
-   elm_object_item_del(it);
-}
-
-EAPI void
-elm_ctxpopup_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled)
-{
-   elm_object_item_disabled_set(it, disabled);
-}
-
-EAPI Eina_Bool
-elm_ctxpopup_item_disabled_get(const Elm_Object_Item *it)
-{
-   return elm_object_item_disabled_get(it);
-}
-
-EAPI void
-elm_ctxpopup_content_set(Evas_Object *obj, Evas_Object *content)
-{
-   elm_object_content_set(obj, content);
-}
-
-EAPI Evas_Object *
-elm_ctxpopup_content_unset(Evas_Object *obj)
-{
-   return elm_object_content_unset(obj);
-}
-
-EAPI void
 elm_ctxpopup_direction_priority_set(Evas_Object *obj,
                                     Elm_Ctxpopup_Direction first,
                                     Elm_Ctxpopup_Direction second,

diff --git a/src/lib/elc_ctxpopup.h b/src/lib/elc_ctxpopup.h
index d428e22..f1855b8 100644 (file)
--- a/src/lib/elc_ctxpopup.h
+++ b/src/lib/elc_ctxpopup.h
@@ -138,7 +138,7 @@ EAPI Eina_Bool                    elm_ctxpopup_horizontal_get(const Evas_Object
  * @warning Ctxpopup can't hold both an item list and a content at the same
  * time. When an item is added, any previous content will be removed.
  *
- * @see elm_ctxpopup_content_set()
+ * @see elm_object_content_set()
  *
  * @ingroup Ctxpopup
  */

diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h
index 3890857..1bd00ae 100644 (file)
--- a/src/lib/elm_deprecated.h
+++ b/src/lib/elm_deprecated.h
@@ -226,143 +226,6 @@ EINA_DEPRECATED EAPI void         elm_scrolled_entry_cnp_textonly_set(Evas_Objec
 EINA_DEPRECATED EAPI Eina_Bool    elm_scrolled_entry_cnp_textonly_get(Evas_Object *obj);
 
 /**
- * @brief Get the ctxpopup item's disabled/enabled state.
- *
- * @param it Ctxpopup item to be enabled/disabled
- * @return disabled @c EINA_TRUE, if disabled, @c EINA_FALSE otherwise
- *
- * @see elm_ctxpopup_item_disabled_set()
- * @deprecated use elm_object_item_disabled_get() instead
- *
- * @ingroup Ctxpopup
- */
-EINA_DEPRECATED EAPI Eina_Bool                    elm_ctxpopup_item_disabled_get(const Elm_Object_Item *it);
-
-/**
- * @brief Set the ctxpopup item's state as disabled or enabled.
- *
- * @param it Ctxpopup item to be enabled/disabled
- * @param disabled @c EINA_TRUE to disable it, @c EINA_FALSE to enable it
- *
- * When disabled the item is greyed out to indicate it's state.
- * @deprecated use elm_object_item_disabled_set() instead
- *
- * @ingroup Ctxpopup
- */
-EINA_DEPRECATED EAPI void         elm_ctxpopup_item_disabled_set(Elm_Object_Item *it, Eina_Bool disabled);
-
-/**
- * @brief Get the icon object for the given ctxpopup item.
- *
- * @param it Ctxpopup item
- * @return icon object or @c NULL, if the item does not have icon or an error
- * occurred
- *
- * @see elm_ctxpopup_item_append()
- * @see elm_ctxpopup_item_icon_set()
- *
- * @deprecated use elm_object_item_part_content_get() instead
- *
- * @ingroup Ctxpopup
- */
-EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_item_icon_get(const Elm_Object_Item *it);
-
-/**
- * @brief Sets the side icon associated with the ctxpopup item
- *
- * @param it Ctxpopup item
- * @param icon Icon object to be set
- *
- * Once the icon object is set, a previously set one will be deleted.
- * @warning Setting the same icon for two items will cause the icon to
- * disappear from the first item.
- *
- * @see elm_ctxpopup_item_append()
- *
- * @deprecated use elm_object_item_part_content_set() instead
- *
- * @ingroup Ctxpopup
- */
-EINA_DEPRECATED EAPI void         elm_ctxpopup_item_icon_set(Elm_Object_Item *it, Evas_Object *icon);
-
-/**
- * @brief Get the label for the given ctxpopup item.
- *
- * @param it Ctxpopup item
- * @return label string or @c NULL, if the item does not have label or an
- * error occurred
- *
- * @see elm_ctxpopup_item_append()
- * @see elm_ctxpopup_item_label_set()
- *
- * @deprecated use elm_object_item_text_get() instead
- *
- * @ingroup Ctxpopup
- */
-EINA_DEPRECATED EAPI const char  *elm_ctxpopup_item_label_get(const Elm_Object_Item *it);
-
-/**
- * @brief (Re)set the label on the given ctxpopup item.
- *
- * @param it Ctxpopup item
- * @param label String to set as label
- *
- * @deprecated use elm_object_item_text_set() instead
- *
- * @ingroup Ctxpopup
- */
-EINA_DEPRECATED EAPI void         elm_ctxpopup_item_label_set(Elm_Object_Item *it, const char *label);
-
-/**
- * @brief Set an elm widget as the content of the ctxpopup.
- *
- * @param obj Ctxpopup object
- * @param content Content to be swallowed
- *
- * If the content object is already set, a previous one will be deleted. If
- * you want to keep that old content object, use the
- * elm_ctxpopup_content_unset() function.
- *
- * @warning Ctxpopup can't hold both a item list and a content at the same
- * time. When a content is set, any previous items will be removed.
- *
- * @deprecated use elm_object_content_set() instead
- *
- * @ingroup Ctxpopup
- */
-EINA_DEPRECATED EAPI void         elm_ctxpopup_content_set(Evas_Object *obj, Evas_Object *content);
-
-/**
- * @brief Unset the ctxpopup content
- *
- * @param obj Ctxpopup object
- * @return The content that was being used
- *
- * Unparent and return the content object which was set for this widget.
- *
- * @deprecated use elm_object_content_unset()
- *
- * @see elm_ctxpopup_content_set()
- *
- * @deprecated use elm_object_content_unset() instead
- *
- * @ingroup Ctxpopup
- */
-EINA_DEPRECATED EAPI Evas_Object *elm_ctxpopup_content_unset(Evas_Object *obj);
-
-/**
- * @brief Delete the given item in a ctxpopup object.
- *
- * @param it Ctxpopup item to be deleted
- *
- * @deprecated Use elm_object_item_del() instead
- * @see elm_ctxpopup_item_append()
- *
- * @ingroup Ctxpopup
- */
-EINA_DEPRECATED EAPI void                         elm_ctxpopup_item_del(Elm_Object_Item *it);
-
-/**
  * Set the label for a given file selector button widget
  *
  * @param obj The file selector button widget