[Elementary.h.in] undeprecated discpicker.

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index f1b2b75..c165c81 100644 (file)
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -1733,26 +1733,26 @@ extern "C" {
     */
 
    typedef struct _Discpicker_Item Elm_Discpicker_Item;
-   EINA_DEPRECATED EAPI Evas_Object     *elm_discpicker_add(Evas_Object *parent);
-   EINA_DEPRECATED EAPI void             elm_discpicker_row_height_set(Evas_Object *obj, unsigned int row_height);
-   EINA_DEPRECATED EAPI void             elm_discpicker_next(Evas_Object *obj);
-   EINA_DEPRECATED EAPI void             elm_discpicker_prev(Evas_Object *obj);
-   EINA_DEPRECATED EAPI Elm_Discpicker_Item *elm_discpicker_item_append(Evas_Object *obj, const char *label, void (*func)(void *data, Evas_Object *obj, void *event_info), void *data);
-   EINA_DEPRECATED EAPI Elm_Discpicker_Item *elm_discpicker_item_prepend(Evas_Object *obj, const char *label, void (*func)(void *data, Evas_Object *obj, void *event_info), void *data);
-   EINA_DEPRECATED EAPI const Eina_List *elm_discpicker_items_get(Evas_Object *obj);
-   EINA_DEPRECATED EAPI Elm_Discpicker_Item *elm_discpicker_first_item_get(Evas_Object *obj);
-   EINA_DEPRECATED EAPI Elm_Discpicker_Item *elm_discpicker_last_item_get(Evas_Object *obj);
-   EINA_DEPRECATED EAPI Elm_Discpicker_Item *elm_discpicker_selected_item_get(Evas_Object *obj);
-   EINA_DEPRECATED EAPI void             elm_discpicker_item_selected_set(Elm_Discpicker_Item *item);
-   EINA_DEPRECATED EAPI void             elm_discpicker_item_del(Elm_Discpicker_Item *item);
-   EINA_DEPRECATED EAPI const char      *elm_discpicker_item_label_get(Elm_Discpicker_Item *item);
-   EINA_DEPRECATED EAPI void             elm_discpicker_item_label_set(Elm_Discpicker_Item *item, const char *label);
-   EINA_DEPRECATED EAPI Elm_Discpicker_Item *elm_discpicker_item_prev(Elm_Discpicker_Item *item);
-   EINA_DEPRECATED EAPI Elm_Discpicker_Item *elm_discpicker_item_next(Elm_Discpicker_Item *item);
-   EINA_DEPRECATED EAPI void            *elm_discpicker_item_data_get(Elm_Discpicker_Item *item);
-   EINA_DEPRECATED EAPI void             elm_discpicker_item_data_set(Elm_Discpicker_Item *item, void *data);
-   EINA_DEPRECATED EAPI Eina_Bool        elm_discpicker_item_disabled_get(Elm_Discpicker_Item *item);
-   EINA_DEPRECATED EAPI void             elm_discpicker_item_disabled_set(Elm_Discpicker_Item *item, Eina_Bool disabled);
+   EAPI Evas_Object     *elm_discpicker_add(Evas_Object *parent);
+   EAPI void             elm_discpicker_row_height_set(Evas_Object *obj, unsigned int row_height);
+   EAPI void             elm_discpicker_next(Evas_Object *obj);
+   EAPI void             elm_discpicker_prev(Evas_Object *obj);
+   EAPI Elm_Discpicker_Item *elm_discpicker_item_append(Evas_Object *obj, const char *label, void (*func)(void *data, Evas_Object *obj, void *event_info), void *data);
+   EAPI Elm_Discpicker_Item *elm_discpicker_item_prepend(Evas_Object *obj, const char *label, void (*func)(void *data, Evas_Object *obj, void *event_info), void *data);
+   EAPI const Eina_List *elm_discpicker_items_get(Evas_Object *obj);
+   EAPI Elm_Discpicker_Item *elm_discpicker_first_item_get(Evas_Object *obj);
+   EAPI Elm_Discpicker_Item *elm_discpicker_last_item_get(Evas_Object *obj);
+   EAPI Elm_Discpicker_Item *elm_discpicker_selected_item_get(Evas_Object *obj);
+   EAPI void             elm_discpicker_item_selected_set(Elm_Discpicker_Item *item);
+   EAPI void             elm_discpicker_item_del(Elm_Discpicker_Item *item);
+   EAPI const char      *elm_discpicker_item_label_get(Elm_Discpicker_Item *item);
+   EAPI void             elm_discpicker_item_label_set(Elm_Discpicker_Item *item, const char *label);
+   EAPI Elm_Discpicker_Item *elm_discpicker_item_prev(Elm_Discpicker_Item *item);
+   EAPI Elm_Discpicker_Item *elm_discpicker_item_next(Elm_Discpicker_Item *item);
+   EAPI void            *elm_discpicker_item_data_get(Elm_Discpicker_Item *item);
+   EAPI void             elm_discpicker_item_data_set(Elm_Discpicker_Item *item, void *data);
+   EAPI Eina_Bool        elm_discpicker_item_disabled_get(Elm_Discpicker_Item *item);
+   EAPI void             elm_discpicker_item_disabled_set(Elm_Discpicker_Item *item, Eina_Bool disabled);
     /* smart callback called:
     * "selected" - when discpicker selected item is changed
     * "overflowed" - when discpicker item is changed to first item from last item
@@ -2467,13 +2467,18 @@ extern "C" {
         ELM_SLIDINGDRAWER_RIGHT,
         ELM_SLIDINGDRAWER_TOP
      } Elm_SlidingDrawer_Pos;
-  
+ 
+   typedef struct _Elm_SlidingDrawer_Drag_Value {
+      double x, y;
+   }Elm_SlidingDrawer_Drag_Value;
+   
    EAPI Evas_Object *elm_slidingdrawer_add(Evas_Object *parent);
    EAPI void         elm_slidingdrawer_content_set (Evas_Object *obj, Evas_Object *content);
    EAPI Evas_Object *elm_slidingdrawer_content_unset(Evas_Object *obj);
    EAPI void         elm_slidingdrawer_pos_set(Evas_Object *obj, Elm_SlidingDrawer_Pos pos);
-   EAPI void         elm_slidingdrawer_max_drag_set(Evas_Object *obj, double dw,  double dh);
-
+   EAPI void         elm_slidingdrawer_max_drag_value_set(Evas_Object *obj, double dw,  double dh);
+   EAPI void         elm_slidingdrawer_drag_value_set(Evas_Object *obj, double dx, double dy);
+   
    /* wipercontrol*/
    EAPI Evas_Object *elm_wipercontrol_add(Evas_Object *parent);
    EAPI void         elm_wipercontrol_below_content_set (Evas_Object *obj, Evas_Object *content);