elementary/pager - farewell pager. you was the best widget ever I know.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69662 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index b155965..844f481 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -187,7 +187,6 @@ elm_map.c \
 elm_menu.c \
 elm_module.c \
 elm_notify.c \
-elm_pager.c \
 elm_panel.c \
 elm_panes.c \
 elm_photo.c \

diff --git a/src/lib/elm_deprecated.h b/src/lib/elm_deprecated.h
index baacadd..ba5206b 100644 (file)
--- a/src/lib/elm_deprecated.h
+++ b/src/lib/elm_deprecated.h
@@ -401,103 +401,6 @@ EINA_DEPRECATED EAPI Elm_Map_Marker_Class *elm_map_marker_class_new(Evas_Object
  */
 EINA_DEPRECATED EAPI void                  elm_map_route_remove(Elm_Map_Route *route);
 
-/*
- * Add a new pager to the parent
- *
- * @param parent The parent object
- * @return The new object or NULL if it cannot be created
- *
- * @deprecated Use naviframe instead
- */
-EINA_DEPRECATED EAPI Evas_Object *elm_pager_add(Evas_Object *parent);
-
-/**
- * @brief Push an object to the top of the pager stack (and show it).
- *
- * @param obj The pager object
- * @param content The object to push
- *
- * The object pushed becomes a child of the pager, it will be controlled and
- * deleted when the pager is deleted.
- *
- * @note If the content is already in the stack use
- * elm_pager_content_promote().
- * @warning Using this function on @p content already in the stack results in
- * undefined behavior.
- * @deprecated Use naviframe instead
- */
-EINA_DEPRECATED EAPI void         elm_pager_content_push(Evas_Object *obj, Evas_Object *content);
-
-/**
- * @brief Pop the object that is on top of the stack
- *
- * @param obj The pager object
- *
- * This pops the object that is on the top(visible) of the pager, makes it
- * disappear, then deletes the object. The object that was underneath it on
- * the stack will become visible.
- * @deprecated Use naviframe instead
- */
-EINA_DEPRECATED EAPI void         elm_pager_content_pop(Evas_Object *obj);
-
-/**
- * @brief Moves an object already in the pager stack to the top of the stack.
- *
- * @param obj The pager object
- * @param content The object to promote
- *
- * This will take the @p content and move it to the top of the stack as
- * if it had been pushed there.
- *
- * @note If the content isn't already in the stack use
- * elm_pager_content_push().
- * @warning Using this function on @p content not already in the stack
- * results in undefined behavior.
- * @deprecated Use naviframe instead
- */
-EINA_DEPRECATED EAPI void         elm_pager_content_promote(Evas_Object *obj, Evas_Object *content);
-
-/**
- * @brief Return the object at the bottom of the pager stack
- *
- * @param obj The pager object
- * @return The bottom object or NULL if none
- * @deprecated Use naviframe instead
- */
-EINA_DEPRECATED EAPI Evas_Object *elm_pager_content_bottom_get(const Evas_Object *obj);
-
-/**
- * @brief  Return the object at the top of the pager stack
- *
- * @param obj The pager object
- * @return The top object or NULL if none
- * @deprecated Use naviframe instead
- */
-EINA_DEPRECATED EAPI Evas_Object *elm_pager_content_top_get(const Evas_Object *obj);
-
-/**
- * @brief Set the default item style.
- *
- * Default item style will be used with items who's style is NULL
- *
- * @param obj The pager object
- * @param style The style
- * @deprecated Use naviframe instead
- */
-EINA_DEPRECATED EAPI void             elm_pager_item_style_default_set(Evas_Object *obj, const char *style);
-
-/**
- * @brief Get the default item style
- *
- * @param obj The pager object
- * @return the default item style
- *
- * @see elm_pager_item_style_default_set()
- * @deprecated Use naviframe instead
- */
-EINA_DEPRECATED EAPI const char      *elm_pager_item_style_default_get(const Evas_Object *obj);
-
-
 /**
  * @deprecated Use elm_object_item_data_get instead.
  */

diff --git a/src/lib/elm_pager.c b/src/lib/elm_pager.c
deleted file mode 100644 (file)
index cfdb671..0000000
--- a/src/lib/elm_pager.c
+++ /dev/null
@@ -1,86 +0,0 @@
-#include <Elementary.h>
-#include "elm_priv.h"
-
-/* FIXME:
- * 1. Possibly remove those callbacks and just use the naviframe ones.
- * 2. I can create a different object, but it can wait until inheritance
- * is implemented, too annoying atm. */
-static void
-_push_finished(void *data __UNUSED__, Evas_Object *obj, void *event_info)
-{
-   evas_object_smart_callback_call(obj, "show,finished", event_info);
-}
-
-static void
-_pop_finished(void *data __UNUSED__, Evas_Object *obj, void *event_info)
-{
-   evas_object_smart_callback_call(obj, "hide,finished", event_info);
-}
-
-EINA_DEPRECATED EAPI Evas_Object *
-elm_pager_add(Evas_Object *parent)
-{
-   Evas_Object *nf = elm_naviframe_add(parent);
-   evas_object_smart_callback_add(nf, "push,finished", _push_finished, NULL);
-   evas_object_smart_callback_add(nf, "pop,finished", _pop_finished, NULL);
-   return nf;
-}
-
-EINA_DEPRECATED EAPI void
-elm_pager_content_push(Evas_Object *obj, Evas_Object *content)
-{
-   Elm_Object_Item *it;
-   it = elm_naviframe_item_push(obj, NULL, NULL, NULL, content, NULL);
-   elm_naviframe_item_title_visible_set(it, EINA_FALSE);
-}
-
-EINA_DEPRECATED EAPI void
-elm_pager_content_pop(Evas_Object *obj)
-{
-   elm_naviframe_item_pop(obj);
-}
-
-EINA_DEPRECATED EAPI void
-elm_pager_content_promote(Evas_Object *obj, Evas_Object *content)
-{
-   Eina_List *items = elm_naviframe_items_get(obj);
-   Eina_List *itr;
-   Elm_Object_Item *it;
-   EINA_LIST_FOREACH(items, itr, it)
-     {
-        if (elm_object_item_content_get(it) == content)
-          {
-             elm_naviframe_item_promote(it);
-             break;
-          }
-     }
-   eina_list_free(items);
-}
-
-EINA_DEPRECATED EAPI Evas_Object *
-elm_pager_content_bottom_get(const Evas_Object *obj)
-{
-   Elm_Object_Item *it;
-   it = elm_naviframe_bottom_item_get(obj);
-   return elm_object_item_content_get(it);
-}
-
-EINA_DEPRECATED EAPI Evas_Object *
-elm_pager_content_top_get(const Evas_Object *obj)
-{
-   Elm_Object_Item *it;
-   it = elm_naviframe_top_item_get(obj);
-   return elm_object_item_content_get(it);
-}
-
-EINA_DEPRECATED EAPI void
-elm_pager_item_style_default_set(Evas_Object *obj, const char *style)
-{
-   elm_object_style_set(obj, style);
-}
-
-EINA_DEPRECATED EAPI const char *
-elm_pager_item_style_default_get(const Evas_Object *obj)
-{
-   return elm_object_style_get(obj);
-}