Merge branch 'master' of 165.213.180.234:/git/slp/pkgs/elementary

[framework/uifw/elementary.git] / src / lib / Elementary.h.in

diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
old mode 100644 (file)
new mode 100755 (executable)
index 137b091..8a68fb3
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -1274,11 +1274,11 @@ extern "C" {
    typedef struct _Elm_Segment_Item Elm_Segment_Item;
    EAPI Evas_Object *elm_segment_control_add(Evas_Object *parent);
    EAPI Elm_Segment_Item * elm_segment_control_add_segment(Evas_Object *obj, Evas_Object *icon, const char *label, Eina_Bool animate)__attribute__((deprecated));
-   EAPI Elm_Segment_Item *elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, Eina_Bool animate);\r
+   EAPI Elm_Segment_Item *elm_segment_control_item_add(Evas_Object *obj, Evas_Object *icon, const char *label, Eina_Bool animate);
    EAPI void         elm_segment_control_insert_segment_at(Evas_Object *obj, Evas_Object *icon, const char *label, unsigned int index, Eina_Bool animate)__attribute__((deprecated));
-   EAPI Elm_Segment_Item *elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, const char *label, unsigned int index, Eina_Bool animate);\r
+   EAPI Elm_Segment_Item *elm_segment_control_item_insert_at(Evas_Object *obj, Evas_Object *icon, const char *label, unsigned int index, Eina_Bool animate);
    EAPI Evas_Object *elm_segment_control_get_segment_at(Evas_Object *obj, unsigned int index);
-   EAPI void         elm_segment_control_item_selected_set(Elm_Segment_Item *item, Eina_Bool select);\r
+   EAPI void         elm_segment_control_item_selected_set(Elm_Segment_Item *item, Eina_Bool select);
    EAPI void         elm_segment_control_delete_segment(Evas_Object *obj, Elm_Segment_Item *item, Eina_Bool animate)__attribute__((deprecated));
    EAPI void         elm_segment_control_item_del(Evas_Object *obj, Elm_Segment_Item *item, Eina_Bool animate);
    EAPI void         elm_segment_control_delete_segment_at(Evas_Object *obj,  unsigned int index, Eina_Bool animate)__attribute__((deprecated));
@@ -1286,9 +1286,9 @@ extern "C" {
    EAPI const char  *elm_segment_control_get_segment_label_at(Evas_Object *obj, unsigned int index)__attribute__((deprecated));
    EAPI const char  *elm_segment_control_item_label_get(Evas_Object *obj, unsigned int index);
    EAPI Evas_Object *elm_segment_control_get_segment_icon_at(Evas_Object *obj, unsigned int index)__attribute__((deprecated));
-   EAPI Evas_Object *elm_segment_control_item_icon_get(Evas_Object *obj, unsigned int index);\r
+   EAPI Evas_Object *elm_segment_control_item_icon_get(Evas_Object *obj, unsigned int index);
    EAPI Elm_Segment_Item *elm_segment_control_selected_segment_get(const Evas_Object *obj, int *value)__attribute__((deprecated));
-   EAPI Elm_Segment_Item *elm_segment_control_item_selected_get(const Evas_Object *obj);\r
+   EAPI Elm_Segment_Item *elm_segment_control_item_selected_get(const Evas_Object *obj);
    EAPI int          elm_segment_control_get_segment_count(Evas_Object *obj)__attribute__((deprecated));
    EAPI int          elm_segment_control_item_count_get(Evas_Object *obj);
    EAPI Evas_Object *elm_segment_control_item_object_get(Elm_Segment_Item *it);
@@ -1837,7 +1837,7 @@ extern "C" {
    EAPI void elm_datefield_date_set(Evas_Object *obj, int year, int month, int day, int hour, int min);
    EAPI void elm_datefield_date_get(Evas_Object *obj, int *year, int *month, int *day, int *hour, int *min);
    EAPI void elm_datefield_time_mode_set(Evas_Object *obj, Eina_Bool mode);    
-
+   EAPI void elm_datefield_date_format_set(Evas_Object *obj, const char *fmt);
 
    /* titlebar */
    EAPI Evas_Object *elm_titlebar_add(Evas_Object *parent);