Elm button: Fix the tests to use the new elm_object_text_set/get API.

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

diff --git a/src/bin/config.c b/src/bin/config.c
index df3d440..8a103e4 100644 (file)
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -1202,7 +1202,7 @@ _sample_theme_new(Evas_Object *win)
 
    bt = elm_button_add(win);
    evas_object_size_hint_weight_set(bt, 1.0, 0.0);
-   elm_button_label_set(bt, "Button");
+   elm_object_text_set(bt, "Button");
    elm_table_pack(base, bt, 0, 0, 1, 1);
    evas_object_show(bt);
 
@@ -1364,7 +1364,7 @@ _status_config_themes(Evas_Object *win,
    /* FIXME: not implemented yet
       bt = elm_button_add(win);
       evas_object_smart_callback_add(bt, "clicked", _theme_browse, win);
-      elm_button_label_set(bt, "Browse...");
+      elm_object_text_set(bt, "Browse...");
       evas_object_size_hint_weight_set(bt, 1.0, 1.0);
       evas_object_size_hint_align_set(bt, 0.9, 0.9);
       elm_frame_content_set(pd, bt);
@@ -1413,7 +1413,7 @@ _status_config_themes(Evas_Object *win,
 
    bt = elm_button_add(win);
    evas_object_smart_callback_add(bt, "clicked", _theme_use, win);
-   elm_button_label_set(bt, "Use Theme");
+   elm_object_text_set(bt, "Use Theme");
    evas_object_size_hint_weight_set(bt, 1.0, 0.0);
    evas_object_size_hint_align_set(bt, 0.5, 0.5);
    elm_frame_content_set(pd, bt);
@@ -2008,7 +2008,7 @@ _status_config_fonts(Evas_Object *win,
 
    bt = elm_button_add(win);
    evas_object_smart_callback_add(bt, "clicked", _font_overlay_set_all, win);
-   elm_button_label_set(bt, "Set to All");
+   elm_object_text_set(bt, "Set to All");
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_size_hint_align_set(bt, 0.5, 0.5);
    elm_box_pack_end(bx, bt);
@@ -2016,7 +2016,7 @@ _status_config_fonts(Evas_Object *win,
 
    bt = elm_button_add(win);
    evas_object_smart_callback_add(bt, "clicked", _font_overlay_reset, win);
-   elm_button_label_set(bt, "Reset");
+   elm_object_text_set(bt, "Reset");
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_size_hint_align_set(bt, 0.5, 0.5);
    elm_box_pack_end(bx, bt);
@@ -2024,7 +2024,7 @@ _status_config_fonts(Evas_Object *win,
 
    bt = elm_button_add(win);
    evas_object_smart_callback_add(bt, "clicked", _font_overlay_reset_all, win);
-   elm_button_label_set(bt, "Reset All");
+   elm_object_text_set(bt, "Reset All");
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_size_hint_align_set(bt, 0.5, 0.5);
    elm_box_pack_end(bx, bt);
@@ -2032,7 +2032,7 @@ _status_config_fonts(Evas_Object *win,
 
    bt = elm_button_add(win);
    evas_object_smart_callback_add(bt, "clicked", _font_overlay_change, win);
-   elm_button_label_set(bt, "Apply");
+   elm_object_text_set(bt, "Apply");
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_size_hint_align_set(bt, 0.5, 0.5);
    elm_box_pack_end(bx, bt);
@@ -2295,7 +2295,7 @@ _status_config_profiles(Evas_Object *win,
 
    bt = elm_button_add(win);
    evas_object_smart_callback_add(bt, "clicked", _profile_use, li);
-   elm_button_label_set(bt, "Use");
+   elm_object_text_set(bt, "Use");
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_size_hint_align_set(bt, 0.5, 0.5);
    elm_box_pack_end(btn_bx, bt);
@@ -2305,7 +2305,7 @@ _status_config_profiles(Evas_Object *win,
 
    bt = elm_button_add(win);
    evas_object_smart_callback_add(bt, "clicked", _btn_todo, NULL); /* TODO */
-   elm_button_label_set(bt, "Delete");
+   elm_object_text_set(bt, "Delete");
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_size_hint_align_set(bt, 0.5, 0.5);
    elm_box_pack_end(btn_bx, bt);
@@ -2315,7 +2315,7 @@ _status_config_profiles(Evas_Object *win,
 
    bt = elm_button_add(win);
    evas_object_smart_callback_add(bt, "clicked", _profile_reset, li);
-   elm_button_label_set(bt, "Reset");
+   elm_object_text_set(bt, "Reset");
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_size_hint_align_set(bt, 0.5, 0.5);
    elm_box_pack_end(btn_bx, bt);
@@ -2325,7 +2325,7 @@ _status_config_profiles(Evas_Object *win,
 
    bt = elm_button_add(win);
    evas_object_smart_callback_add(bt, "clicked", _btn_todo, NULL); /* TODO */
-   elm_button_label_set(bt, "Add new");
+   elm_object_text_set(bt, "Add new");
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_size_hint_align_set(bt, 0.5, 0.5);
    elm_box_pack_end(btn_bx, bt);
@@ -2708,7 +2708,7 @@ _status_config_rendering(Evas_Object *win,
 
    bt = elm_button_add(win);
    evas_object_smart_callback_add(bt, "clicked", _engine_use, li);
-   elm_button_label_set(bt, "Use Engine");
+   elm_object_text_set(bt, "Use Engine");
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_size_hint_align_set(bt, 0.5, 0.5);
    elm_frame_content_set(pd, bt);

diff --git a/src/bin/test_anchorblock.c b/src/bin/test_anchorblock.c
index d7dcd1b..450e388 100644 (file)
--- a/src/bin/test_anchorblock.c
+++ b/src/bin/test_anchorblock.c
@@ -25,7 +25,7 @@ my_anchorblock_anchor(void *data, Evas_Object *obj, void *event_info)
    Evas_Object *bt, *bx;
 
    bt = elm_button_add(obj);
-   elm_button_label_set(bt, ei->name);
+   elm_object_text_set(bt, ei->name);
    elm_hover_content_set(ei->hover, "middle", bt);
    evas_object_show(bt);
 
@@ -34,17 +34,17 @@ my_anchorblock_anchor(void *data, Evas_Object *obj, void *event_info)
      {
        bx = elm_box_add(obj);
        bt = elm_button_add(obj);
-       elm_button_label_set(bt, "Top 1");
+       elm_object_text_set(bt, "Top 1");
        elm_box_pack_end(bx, bt);
        evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av);
        evas_object_show(bt);
        bt = elm_button_add(obj);
-       elm_button_label_set(bt, "Top 2");
+       elm_object_text_set(bt, "Top 2");
        elm_box_pack_end(bx, bt);
        evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av);
        evas_object_show(bt);
        bt = elm_button_add(obj);
-       elm_button_label_set(bt, "Top 3");
+       elm_object_text_set(bt, "Top 3");
        elm_box_pack_end(bx, bt);
        evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av);
        evas_object_show(bt);
@@ -54,7 +54,7 @@ my_anchorblock_anchor(void *data, Evas_Object *obj, void *event_info)
    if (ei->hover_bottom)
      {
        bt = elm_button_add(obj);
-       elm_button_label_set(bt, "Bot");
+       elm_object_text_set(bt, "Bot");
        elm_hover_content_set(ei->hover, "bottom", bt);
        evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av);
        evas_object_show(bt);
@@ -62,7 +62,7 @@ my_anchorblock_anchor(void *data, Evas_Object *obj, void *event_info)
    if (ei->hover_left)
      {
        bt = elm_button_add(obj);
-       elm_button_label_set(bt, "Left");
+       elm_object_text_set(bt, "Left");
        elm_hover_content_set(ei->hover, "left", bt);
        evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av);
        evas_object_show(bt);
@@ -70,7 +70,7 @@ my_anchorblock_anchor(void *data, Evas_Object *obj, void *event_info)
    if (ei->hover_right)
      {
        bt = elm_button_add(obj);
-       elm_button_label_set(bt, "Right");
+       elm_object_text_set(bt, "Right");
        elm_hover_content_set(ei->hover, "right", bt);
        evas_object_smart_callback_add(bt, "clicked", my_anchorblock_bt, av);
        evas_object_show(bt);

diff --git a/src/bin/test_anchorview.c b/src/bin/test_anchorview.c
index 9d79664..ab8825d 100644 (file)
--- a/src/bin/test_anchorview.c
+++ b/src/bin/test_anchorview.c
@@ -18,7 +18,7 @@ my_anchorview_anchor(void *data, Evas_Object *obj, void *event_info)
    Evas_Object *bt, *bx;
 
    bt = elm_button_add(obj);
-   elm_button_label_set(bt, ei->name);
+   elm_object_text_set(bt, ei->name);
    elm_hover_content_set(ei->hover, "middle", bt);
    evas_object_show(bt);
 
@@ -27,17 +27,17 @@ my_anchorview_anchor(void *data, Evas_Object *obj, void *event_info)
      {
        bx = elm_box_add(obj);
        bt = elm_button_add(obj);
-       elm_button_label_set(bt, "Top 1");
+       elm_object_text_set(bt, "Top 1");
        elm_box_pack_end(bx, bt);
        evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av);
        evas_object_show(bt);
        bt = elm_button_add(obj);
-       elm_button_label_set(bt, "Top 2");
+       elm_object_text_set(bt, "Top 2");
        elm_box_pack_end(bx, bt);
        evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av);
        evas_object_show(bt);
        bt = elm_button_add(obj);
-       elm_button_label_set(bt, "Top 3");
+       elm_object_text_set(bt, "Top 3");
        elm_box_pack_end(bx, bt);
        evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av);
        evas_object_show(bt);
@@ -47,7 +47,7 @@ my_anchorview_anchor(void *data, Evas_Object *obj, void *event_info)
    if (ei->hover_bottom)
      {
        bt = elm_button_add(obj);
-       elm_button_label_set(bt, "Bot");
+       elm_object_text_set(bt, "Bot");
        elm_hover_content_set(ei->hover, "bottom", bt);
        evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av);
        evas_object_show(bt);
@@ -55,7 +55,7 @@ my_anchorview_anchor(void *data, Evas_Object *obj, void *event_info)
    if (ei->hover_left)
      {
        bt = elm_button_add(obj);
-       elm_button_label_set(bt, "Left");
+       elm_object_text_set(bt, "Left");
        elm_hover_content_set(ei->hover, "left", bt);
        evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av);
        evas_object_show(bt);
@@ -63,7 +63,7 @@ my_anchorview_anchor(void *data, Evas_Object *obj, void *event_info)
    if (ei->hover_right)
      {
        bt = elm_button_add(obj);
-       elm_button_label_set(bt, "Right");
+       elm_object_text_set(bt, "Right");
        elm_hover_content_set(ei->hover, "right", bt);
        evas_object_smart_callback_add(bt, "clicked", my_anchorview_bt, av);
        evas_object_show(bt);

diff --git a/src/bin/test_box.c b/src/bin/test_box.c
index 0ded51c..289dae5 100644 (file)
--- a/src/bin/test_box.c
+++ b/src/bin/test_box.c
@@ -80,7 +80,7 @@ test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(bx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 1");
+   elm_object_text_set(bt, "Button 1");
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_smart_callback_add(bt, "clicked", _del_cb, bx);
@@ -88,7 +88,7 @@ test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 2");
+   elm_object_text_set(bt, "Button 2");
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_smart_callback_add(bt, "clicked", _del_cb, bx);
@@ -96,7 +96,7 @@ test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 3");
+   elm_object_text_set(bt, "Button 3");
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_smart_callback_add(bt, "clicked", _del_cb, bx);
@@ -104,7 +104,7 @@ test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 4");
+   elm_object_text_set(bt, "Button 4");
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_smart_callback_add(bt, "clicked", _del_cb, bx);
@@ -112,7 +112,7 @@ test_box_vert2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 5");
+   elm_object_text_set(bt, "Button 5");
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
    evas_object_smart_callback_add(bt, "clicked", _del_cb, bx);
@@ -225,7 +225,7 @@ test_box_transition(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_show(bx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 1");
+   elm_object_text_set(bt, "Button 1");
    evas_object_size_hint_weight_set(bt, 1.0, 1.0);
    evas_object_size_hint_align_set(bt, -1.0, -1.0);
    evas_object_smart_callback_add(bt, "clicked", _del_cb, bx);
@@ -234,7 +234,7 @@ test_box_transition(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 2");
+   elm_object_text_set(bt, "Button 2");
    evas_object_size_hint_weight_set(bt, 1.0, 1.0);
    evas_object_size_hint_align_set(bt, -1.0, -1.0);
    evas_object_smart_callback_add(bt, "clicked", _del_cb, bx);
@@ -243,7 +243,7 @@ test_box_transition(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 3");
+   elm_object_text_set(bt, "Button 3");
    evas_object_size_hint_weight_set(bt, 1.0, 1.0);
    evas_object_size_hint_align_set(bt, -1.0, -1.0);
    evas_object_smart_callback_add(bt, "clicked", _del_cb, bx);

diff --git a/src/bin/test_button.c b/src/bin/test_button.c
index 84f7447..350a99d 100644 (file)
--- a/src/bin/test_button.c
+++ b/src/bin/test_button.c
@@ -12,7 +12,7 @@ _bt_repeated(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED_
    snprintf(buf, sizeof(buf), "count=%d", count++);
    if (count >= 10000)
      count = 0;
-   elm_button_label_set(obj, buf);
+   elm_object_text_set(obj, buf);
 }
 
 static void
@@ -63,7 +63,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_icon_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Icon sized to button");
+   elm_object_text_set(bt, "Icon sized to button");
    elm_button_icon_set(bt, ic);
    evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)1);
    evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)1);
@@ -76,7 +76,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_icon_file_set(ic, buf, NULL);
    elm_icon_scale_set(ic, 0, 0);
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Icon no scale");
+   elm_object_text_set(bt, "Icon no scale");
    elm_button_icon_set(bt, ic);
    evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)2);
    evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)2);
@@ -89,7 +89,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_icon_file_set(ic, buf, NULL);
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Disabled Button");
+   elm_object_text_set(bt, "Disabled Button");
    elm_button_icon_set(bt, ic);
    elm_object_disabled_set(bt, 1);
    evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)3);
@@ -112,7 +112,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(ic);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Label Only");
+   elm_object_text_set(bt, "Label Only");
    evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)5);
    evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)5);
    elm_box_pack_end(bx, bt);
@@ -136,7 +136,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    bt = elm_button_add(win);
    elm_object_style_set(bt, "anchor");
-   elm_button_label_set(bt, "Anchor style");
+   elm_object_text_set(bt, "Anchor style");
    evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)7);
    evas_object_smart_callback_add(bt, "unpressed", _bt_unpressed, (void *)7);
    elm_box_pack_end(bx, bt);

diff --git a/src/bin/test_clock.c b/src/bin/test_clock.c
index e1f88ce..d2c9bba 100644 (file)
--- a/src/bin/test_clock.c
+++ b/src/bin/test_clock.c
@@ -75,11 +75,11 @@ _edit_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__)
    Evas_Object *ck = data;
 
    if (!elm_clock_edit_get(ck)) {
-       elm_button_label_set(obj, "Done");
+       elm_object_text_set(obj, "Done");
        elm_clock_edit_set(ck, 1);
        return;
    }
-   elm_button_label_set(obj, "Edit");
+   elm_object_text_set(obj, "Edit");
    elm_clock_edit_set(ck, 0);
 }
 
@@ -89,11 +89,11 @@ _hmode_bt_clicked(void *data, Evas_Object *obj, void *event_info __UNUSED__)
    Evas_Object *ck = data;
 
    if (!elm_clock_show_am_pm_get(ck)) {
-       elm_button_label_set(obj, "24h");
+       elm_object_text_set(obj, "24h");
        elm_clock_show_am_pm_set(ck, 1);
        return;
    }
-   elm_button_label_set(obj, "12h");
+   elm_object_text_set(obj, "12h");
    elm_clock_show_am_pm_set(ck, 0);
 }
 
@@ -129,13 +129,13 @@ test_clock2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(hbx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Edit");
+   elm_object_text_set(bt, "Edit");
    evas_object_smart_callback_add(bt, "clicked", _edit_bt_clicked, ck);
    elm_box_pack_end(hbx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "24h");
+   elm_object_text_set(bt, "24h");
    evas_object_smart_callback_add(bt, "clicked", _hmode_bt_clicked, ck);
    elm_box_pack_end(hbx, bt);
    evas_object_show(bt);

diff --git a/src/bin/test_conform.c b/src/bin/test_conform.c
index c08822e..9a53e6d 100644 (file)
--- a/src/bin/test_conform.c
+++ b/src/bin/test_conform.c
@@ -39,7 +39,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    elm_box_pack_end(bx, en);
 
    btn = elm_button_add(win);
-   elm_button_label_set(btn, "Test Conformant");
+   elm_object_text_set(btn, "Test Conformant");
    evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bx, btn);
@@ -56,7 +56,7 @@ test_conformant(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    elm_box_pack_end(bx, en);
 
    btn = elm_button_add(win);
-   elm_button_label_set(btn, "Test Conformant");
+   elm_object_text_set(btn, "Test Conformant");
    evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bx, btn);
@@ -126,7 +126,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
 
    btn = elm_button_add(win);
    elm_object_focus_allow_set(btn, 0);
-   elm_button_label_set(btn, "Delete Below");
+   elm_object_text_set(btn, "Delete Below");
    evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bx, btn);
@@ -161,7 +161,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
 
    btn = elm_button_add(win);
    elm_object_focus_allow_set(btn, 0);
-   elm_button_label_set(btn, "Delete this bottom bit 1");
+   elm_object_text_set(btn, "Delete this bottom bit 1");
    evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bx, btn);
@@ -193,7 +193,7 @@ test_conformant2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
 
    btn = elm_button_add(win);
    elm_object_focus_allow_set(btn, 0);
-   elm_button_label_set(btn, "Delete this bottom bit 2");
+   elm_object_text_set(btn, "Delete this bottom bit 2");
    evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(bx, btn);

diff --git a/src/bin/test_ctxpopup.c b/src/bin/test_ctxpopup.c
index 0677e4d..59aef37 100644 (file)
--- a/src/bin/test_ctxpopup.c
+++ b/src/bin/test_ctxpopup.c
@@ -131,7 +131,7 @@ _list_item_cb5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(sc);
 
    btn = elm_button_add(sc);
-   elm_button_label_set(btn, "Enlightenment");
+   elm_object_text_set(btn, "Enlightenment");
    evas_object_size_hint_min_set(btn, 140, 140);
 
    elm_scroller_content_set(sc, btn);

diff --git a/src/bin/test_cursor.c b/src/bin/test_cursor.c
index 3cceee0..96d950f 100644 (file)
--- a/src/bin/test_cursor.c
+++ b/src/bin/test_cursor.c
@@ -121,13 +121,13 @@ test_cursor(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    bt = elm_button_add(win);
    elm_object_cursor_set(bt, ELM_CURSOR_COFFEE_MUG);
-   elm_button_label_set(bt, "Coffee Mug");
+   elm_object_text_set(bt, "Coffee Mug");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
    elm_object_cursor_set(bt, ELM_CURSOR_CLOCK);
-   elm_button_label_set(bt, "Cursor unset");
+   elm_object_text_set(bt, "Cursor unset");
    elm_object_cursor_unset(bt);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -311,27 +311,27 @@ test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    o = elm_button_add(win);
    elm_object_cursor_set(o, ELM_CURSOR_HAND1);
    elm_object_cursor_engine_only_set(o, EINA_FALSE);
-   elm_button_label_set(o, "hand1");
+   elm_object_text_set(o, "hand1");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, ELM_CURSOR_HAND2);
-   elm_button_label_set(o, "hand2 x");
+   elm_object_text_set(o, "hand2 x");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, ELM_CURSOR_HAND2);
    elm_object_cursor_engine_only_set(o, EINA_FALSE);
-   elm_button_label_set(o, "hand2");
+   elm_object_text_set(o, "hand2");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand3");
    elm_object_cursor_engine_only_set(o, EINA_FALSE);
-   elm_button_label_set(o, "hand3");
+   elm_object_text_set(o, "hand3");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
@@ -339,7 +339,7 @@ test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    elm_object_cursor_set(o, "hand3");
    elm_object_cursor_engine_only_set(o, EINA_FALSE);
    elm_object_cursor_style_set(o, "transparent");
-   elm_button_label_set(o, "hand3 transparent");
+   elm_object_text_set(o, "hand3 transparent");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
@@ -347,27 +347,27 @@ test_cursor3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    elm_object_cursor_set(o, "hand3");
    elm_object_cursor_engine_only_set(o, EINA_FALSE);
    elm_object_cursor_unset(o);
-   elm_button_label_set(o, "unset");
+   elm_object_text_set(o, "unset");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand4");
-   elm_button_label_set(o, "not existent");
+   elm_object_text_set(o, "not existent");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    elm_cursor_engine_only_set(0);
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand2");
-   elm_button_label_set(o, "hand 2 engine only config false");
+   elm_object_text_set(o, "hand 2 engine only config false");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 
    elm_cursor_engine_only_set(1);
    o = elm_button_add(win);
    elm_object_cursor_set(o, "hand2");
-   elm_button_label_set(o, "hand 2 engine only config true");
+   elm_object_text_set(o, "hand 2 engine only config true");
    elm_box_pack_end(bx, o);
    evas_object_show(o);
 

diff --git a/src/bin/test_eio.c b/src/bin/test_eio.c
index cbc6e33..fa66266 100644 (file)
--- a/src/bin/test_eio.c
+++ b/src/bin/test_eio.c
@@ -164,7 +164,7 @@ test_eio(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __
 
    /* attribute setting buttons */
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "clear");
+   elm_object_text_set(bt, "clear");
    evas_object_smart_callback_add(bt, "clicked", _test_eio_clear, gl);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);

diff --git a/src/bin/test_entry.c b/src/bin/test_entry.c
index e58677e..2f1617b 100644 (file)
--- a/src/bin/test_entry.c
+++ b/src/bin/test_entry.c
@@ -139,7 +139,7 @@ test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Clr");
+   elm_object_text_set(bt, "Clr");
    evas_object_smart_callback_add(bt, "clicked", my_entry_bt_1, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -149,7 +149,7 @@ test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Prnt");
+   elm_object_text_set(bt, "Prnt");
    evas_object_smart_callback_add(bt, "clicked", my_entry_bt_2, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -159,7 +159,7 @@ test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Sel");
+   elm_object_text_set(bt, "Sel");
    evas_object_smart_callback_add(bt, "clicked", my_entry_bt_3, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -169,7 +169,7 @@ test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Ins");
+   elm_object_text_set(bt, "Ins");
    evas_object_smart_callback_add(bt, "clicked", my_entry_bt_4, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -179,7 +179,7 @@ test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Scrl");
+   elm_object_text_set(bt, "Scrl");
    evas_object_smart_callback_add(bt, "clicked", my_entry_bt_5, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -189,7 +189,7 @@ test_entry(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Wr");
+   elm_object_text_set(bt, "Wr");
    evas_object_smart_callback_add(bt, "clicked", my_entry_bt_6, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -476,7 +476,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Clear");
+   elm_object_text_set(bt, "Clear");
    evas_object_smart_callback_add(bt, "clicked", my_scrolled_entry_bt_1, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -486,7 +486,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Print");
+   elm_object_text_set(bt, "Print");
    evas_object_smart_callback_add(bt, "clicked", my_scrolled_entry_bt_2, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -496,7 +496,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Print pwd");
+   elm_object_text_set(bt, "Print pwd");
    evas_object_smart_callback_add(bt, "clicked", my_scrolled_entry_bt_5, en_p);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -506,7 +506,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Selection");
+   elm_object_text_set(bt, "Selection");
    evas_object_smart_callback_add(bt, "clicked", my_scrolled_entry_bt_3, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -516,7 +516,7 @@ test_entry_scrolled(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Insert");
+   elm_object_text_set(bt, "Insert");
    evas_object_smart_callback_add(bt, "clicked", my_scrolled_entry_bt_4, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -750,7 +750,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Clr");
+   elm_object_text_set(bt, "Clr");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_clr, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -760,7 +760,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Pri");
+   elm_object_text_set(bt, "Pri");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pri, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -770,7 +770,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Sel");
+   elm_object_text_set(bt, "Sel");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sel, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -780,7 +780,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "All");
+   elm_object_text_set(bt, "All");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_all, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -790,7 +790,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Non");
+   elm_object_text_set(bt, "Non");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_non, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -800,7 +800,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Ins");
+   elm_object_text_set(bt, "Ins");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_ins, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -818,7 +818,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Lef");
+   elm_object_text_set(bt, "Lef");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_lef, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -828,7 +828,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Rig");
+   elm_object_text_set(bt, "Rig");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_rig, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -838,7 +838,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Up ");
+   elm_object_text_set(bt, "Up ");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_up_, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -848,7 +848,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Dow");
+   elm_object_text_set(bt, "Dow");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_dow, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -858,7 +858,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Beg");
+   elm_object_text_set(bt, "Beg");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_beg, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -868,7 +868,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "End");
+   elm_object_text_set(bt, "End");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_end, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -886,7 +886,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "LBe");
+   elm_object_text_set(bt, "LBe");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_lbe, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -896,7 +896,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "LEn");
+   elm_object_text_set(bt, "LEn");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_len, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -906,7 +906,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "SBe");
+   elm_object_text_set(bt, "SBe");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sbe, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -916,7 +916,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "SEn");
+   elm_object_text_set(bt, "SEn");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sen, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -926,7 +926,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Fmt");
+   elm_object_text_set(bt, "Fmt");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_fmt, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -936,7 +936,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "VFm");
+   elm_object_text_set(bt, "VFm");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_vfm, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -954,7 +954,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Chr");
+   elm_object_text_set(bt, "Chr");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_chr, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -964,7 +964,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Cut");
+   elm_object_text_set(bt, "Cut");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_cut, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -974,7 +974,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Cop");
+   elm_object_text_set(bt, "Cop");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_cop, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -984,7 +984,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Pas");
+   elm_object_text_set(bt, "Pas");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pas, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1024,7 +1024,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Clr");
+   elm_object_text_set(bt, "Clr");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_clr, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1034,7 +1034,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Pri");
+   elm_object_text_set(bt, "Pri");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pri, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1044,7 +1044,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Sel");
+   elm_object_text_set(bt, "Sel");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sel, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1054,7 +1054,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "All");
+   elm_object_text_set(bt, "All");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_all, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1064,7 +1064,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Non");
+   elm_object_text_set(bt, "Non");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_non, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1074,7 +1074,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Ins");
+   elm_object_text_set(bt, "Ins");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_ins, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1092,7 +1092,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Lef");
+   elm_object_text_set(bt, "Lef");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_lef, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1102,7 +1102,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Rig");
+   elm_object_text_set(bt, "Rig");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_rig, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1112,7 +1112,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Up ");
+   elm_object_text_set(bt, "Up ");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_up_, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1122,7 +1122,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Dow");
+   elm_object_text_set(bt, "Dow");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_dow, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1132,7 +1132,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Beg");
+   elm_object_text_set(bt, "Beg");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_beg, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1142,7 +1142,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "End");
+   elm_object_text_set(bt, "End");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_end, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1160,7 +1160,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "LBe");
+   elm_object_text_set(bt, "LBe");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_lbe, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1170,7 +1170,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "LEn");
+   elm_object_text_set(bt, "LEn");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_len, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1180,7 +1180,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "SBe");
+   elm_object_text_set(bt, "SBe");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sbe, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1190,7 +1190,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "SEn");
+   elm_object_text_set(bt, "SEn");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sen, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1200,7 +1200,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Fmt");
+   elm_object_text_set(bt, "Fmt");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_fmt, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1210,7 +1210,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "VFm");
+   elm_object_text_set(bt, "VFm");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_vfm, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1228,7 +1228,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Chr");
+   elm_object_text_set(bt, "Chr");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_chr, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1238,7 +1238,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Cut");
+   elm_object_text_set(bt, "Cut");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_cut, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1248,7 +1248,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Cop");
+   elm_object_text_set(bt, "Cop");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_cop, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1258,7 +1258,7 @@ test_entry3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Pas");
+   elm_object_text_set(bt, "Pas");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pas, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1389,7 +1389,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Clr");
+   elm_object_text_set(bt, "Clr");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_clr, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1399,7 +1399,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Pri");
+   elm_object_text_set(bt, "Pri");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pri, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1409,7 +1409,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Sel");
+   elm_object_text_set(bt, "Sel");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sel, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1419,7 +1419,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "All");
+   elm_object_text_set(bt, "All");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_all, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1429,7 +1429,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Non");
+   elm_object_text_set(bt, "Non");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_non, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1439,7 +1439,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Ins");
+   elm_object_text_set(bt, "Ins");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_ins, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1457,7 +1457,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Lef");
+   elm_object_text_set(bt, "Lef");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_lef, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1467,7 +1467,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Rig");
+   elm_object_text_set(bt, "Rig");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_rig, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1477,7 +1477,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Up ");
+   elm_object_text_set(bt, "Up ");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_up_, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1487,7 +1487,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Dow");
+   elm_object_text_set(bt, "Dow");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_dow, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1497,7 +1497,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Beg");
+   elm_object_text_set(bt, "Beg");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_beg, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1507,7 +1507,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "End");
+   elm_object_text_set(bt, "End");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_end, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1525,7 +1525,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "LBe");
+   elm_object_text_set(bt, "LBe");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_lbe, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1535,7 +1535,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "LEn");
+   elm_object_text_set(bt, "LEn");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_len, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1545,7 +1545,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "SBe");
+   elm_object_text_set(bt, "SBe");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sbe, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1555,7 +1555,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "SEn");
+   elm_object_text_set(bt, "SEn");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_sen, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1565,7 +1565,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Fmt");
+   elm_object_text_set(bt, "Fmt");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_fmt, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1575,7 +1575,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "VFm");
+   elm_object_text_set(bt, "VFm");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_vfm, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1593,7 +1593,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Chr");
+   elm_object_text_set(bt, "Chr");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_chr, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1603,7 +1603,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Cut");
+   elm_object_text_set(bt, "Cut");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_cut, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1613,7 +1613,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Cop");
+   elm_object_text_set(bt, "Cop");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_cop, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1623,7 +1623,7 @@ test_entry5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Pas");
+   elm_object_text_set(bt, "Pas");
    evas_object_smart_callback_add(bt, "clicked", my_ent_bt_pas, en);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1682,7 +1682,7 @@ test_entry_notepad(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Clear");
+   elm_object_text_set(bt, "Clear");
    evas_object_smart_callback_add(bt, "clicked", _scrolled_entry_clear, np);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);

diff --git a/src/bin/test_fileselector.c b/src/bin/test_fileselector.c
index 7918f10..c669c11 100644 (file)
--- a/src/bin/test_fileselector.c
+++ b/src/bin/test_fileselector.c
@@ -188,19 +188,19 @@ test_fileselector(void *data       __UNUSED__,
    evas_object_show(hbox);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "selected get");
+   elm_object_text_set(bt, "selected get");
    evas_object_smart_callback_add(bt, "clicked", _sel_get_clicked, fs);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "path get");
+   elm_object_text_set(bt, "path get");
    evas_object_smart_callback_add(bt, "clicked", _path_get_clicked, fs);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "mode cycle");
+   elm_object_text_set(bt, "mode cycle");
    evas_object_smart_callback_add(bt, "clicked", _mode_cycle_clicked, fs);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);

diff --git a/src/bin/test_fileselector_button.c b/src/bin/test_fileselector_button.c
index 4742f2c..e48013b 100644 (file)
--- a/src/bin/test_fileselector_button.c
+++ b/src/bin/test_fileselector_button.c
@@ -105,25 +105,25 @@ test_fileselector_button(void *data       __UNUSED__,
    evas_object_show(hbox);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Toggle current selection text entry");
+   elm_object_text_set(bt, "Toggle current selection text entry");
    evas_object_smart_callback_add(bt, "clicked", _current_sel_toggle, fs_bt);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Toggle inwin mode");
+   elm_object_text_set(bt, "Toggle inwin mode");
    evas_object_smart_callback_add(bt, "clicked", _inwin_mode_toggle, fs_bt);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Toggle folder only mode");
+   elm_object_text_set(bt, "Toggle folder only mode");
    evas_object_smart_callback_add(bt, "clicked", _folder_only_toggle, fs_bt);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Toggle expandable mode");
+   elm_object_text_set(bt, "Toggle expandable mode");
    evas_object_smart_callback_add(bt, "clicked", _expandable_toggle, fs_bt);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);

diff --git a/src/bin/test_fileselector_entry.c b/src/bin/test_fileselector_entry.c
index d4b09d7..adae812 100644 (file)
--- a/src/bin/test_fileselector_entry.c
+++ b/src/bin/test_fileselector_entry.c
@@ -112,19 +112,19 @@ test_fileselector_entry(void *data       __UNUSED__,
    evas_object_show(hbox);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Toggle inwin mode");
+   elm_object_text_set(bt, "Toggle inwin mode");
    evas_object_smart_callback_add(bt, "clicked", _inwin_mode_toggle, fs_en);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Toggle folder only mode");
+   elm_object_text_set(bt, "Toggle folder only mode");
    evas_object_smart_callback_add(bt, "clicked", _folder_only_toggle, fs_en);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Toggle expandable mode");
+   elm_object_text_set(bt, "Toggle expandable mode");
    evas_object_smart_callback_add(bt, "clicked", _expandable_toggle, fs_en);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);
@@ -140,7 +140,7 @@ test_fileselector_entry(void *data       __UNUSED__,
    evas_object_show(hbox);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Toggle disabled");
+   elm_object_text_set(bt, "Toggle disabled");
    evas_object_smart_callback_add(bt, "clicked", _disabled_toggle, fs_en);
    elm_box_pack_end(hbox, bt);
    evas_object_show(bt);

diff --git a/src/bin/test_flip.c b/src/bin/test_flip.c
index 7c97d3c..7e496db 100644 (file)
--- a/src/bin/test_flip.c
+++ b/src/bin/test_flip.c
@@ -103,17 +103,17 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
    evas_object_show(ly);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 1");
+   elm_object_text_set(bt, "Button 1");
    elm_layout_content_set(ly, "element1", bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 2");
+   elm_object_text_set(bt, "Button 2");
    elm_layout_content_set(ly, "element2", bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 3");
+   elm_object_text_set(bt, "Button 3");
    elm_layout_content_set(ly, "element3", bt);
    evas_object_show(bt);
 
@@ -125,7 +125,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
    evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "1");
+   elm_object_text_set(bt, "1");
    evas_object_smart_callback_add(bt, "clicked", my_fl_1, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -133,7 +133,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "2");
+   elm_object_text_set(bt, "2");
    evas_object_smart_callback_add(bt, "clicked", my_fl_2, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -141,7 +141,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "3");
+   elm_object_text_set(bt, "3");
    evas_object_smart_callback_add(bt, "clicked", my_fl_3, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -149,7 +149,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "4");
+   elm_object_text_set(bt, "4");
    evas_object_smart_callback_add(bt, "clicked", my_fl_4, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -165,7 +165,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
    evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "5");
+   elm_object_text_set(bt, "5");
    evas_object_smart_callback_add(bt, "clicked", my_fl_5, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -173,7 +173,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "6");
+   elm_object_text_set(bt, "6");
    evas_object_smart_callback_add(bt, "clicked", my_fl_6, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -181,7 +181,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "7");
+   elm_object_text_set(bt, "7");
    evas_object_smart_callback_add(bt, "clicked", my_fl_7, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -189,7 +189,7 @@ test_flip(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "8");
+   elm_object_text_set(bt, "8");
    evas_object_smart_callback_add(bt, "clicked", my_fl_8, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -319,7 +319,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "1");
+   elm_object_text_set(bt, "1");
    evas_object_smart_callback_add(bt, "clicked", my_fl_1, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -327,7 +327,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "2");
+   elm_object_text_set(bt, "2");
    evas_object_smart_callback_add(bt, "clicked", my_fl_2, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -335,7 +335,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "3");
+   elm_object_text_set(bt, "3");
    evas_object_smart_callback_add(bt, "clicked", my_fl_3, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -343,7 +343,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "4");
+   elm_object_text_set(bt, "4");
    evas_object_smart_callback_add(bt, "clicked", my_fl_4, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -351,7 +351,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "5");
+   elm_object_text_set(bt, "5");
    evas_object_smart_callback_add(bt, "clicked", my_fl_5, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -359,7 +359,7 @@ test_flip2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "6");
+   elm_object_text_set(bt, "6");
    evas_object_smart_callback_add(bt, "clicked", my_fl_6, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -463,7 +463,7 @@ test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.0);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Main Flip");
+   elm_object_text_set(bt, "Main Flip");
    evas_object_smart_callback_add(bt, "clicked", my_fl_6, fl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -471,7 +471,7 @@ test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Front Flip");
+   elm_object_text_set(bt, "Front Flip");
    evas_object_smart_callback_add(bt, "clicked", my_fl_6, fl_f);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -479,7 +479,7 @@ test_flip3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Back Flip");
+   elm_object_text_set(bt, "Back Flip");
    evas_object_smart_callback_add(bt, "clicked", my_fl_6, fl_b);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -618,7 +618,7 @@ test_flip4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_smart_callback_add(rd, "changed", my_fl_ch, win);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Go");
+   elm_object_text_set(bt, "Go");
    evas_object_smart_callback_add(bt, "clicked", my_fl_go, win);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);

diff --git a/src/bin/test_flipselector.c b/src/bin/test_flipselector.c
index 235cb8c..a216beb 100644 (file)
--- a/src/bin/test_flipselector.c
+++ b/src/bin/test_flipselector.c
@@ -99,13 +99,13 @@ test_flipselector(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *even
    evas_object_show(fp);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Select 2097");
+   elm_object_text_set(bt, "Select 2097");
    evas_object_smart_callback_add(bt, "clicked", _third_cb, fp);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Unselect year");
+   elm_object_text_set(bt, "Unselect year");
    evas_object_smart_callback_add(bt, "clicked", _unsel_cb, fp);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);

diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c
index a7cc1e2..7918151 100644 (file)
--- a/src/bin/test_focus.c
+++ b/src/bin/test_focus.c
@@ -130,7 +130,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
                {
                   Evas_Object *bt;
                   bt = elm_button_add(win);
-                  elm_button_label_set(bt, "Box");
+                  elm_object_text_set(bt, "Box");
                   evas_object_size_hint_align_set(bt, EVAS_HINT_FILL,
                                                   EVAS_HINT_FILL);
                   evas_object_size_hint_weight_set(bt, 0.0, 0.0);
@@ -154,7 +154,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
                     {
                        Evas_Object *bt;
                        bt = elm_button_add(win);
-                       elm_button_label_set(bt, "Scroller");
+                       elm_object_text_set(bt, "Scroller");
                        evas_object_size_hint_align_set(bt, EVAS_HINT_FILL,
                                                        EVAS_HINT_FILL);
                        evas_object_size_hint_weight_set(bt, 0.0, 0.0);
@@ -171,7 +171,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
           {
              Evas_Object *bt;
              bt = elm_button_add(win);
-             elm_button_label_set(bt, "Box");
+             elm_object_text_set(bt, "Box");
              evas_object_size_hint_align_set(bt, EVAS_HINT_FILL,
                                              EVAS_HINT_FILL);
              evas_object_size_hint_weight_set(bt, 0.0, 0.0);
@@ -201,7 +201,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
                     {
                        Evas_Object *bt;
                        bt = elm_button_add(win);
-                       elm_button_label_set(bt, "Box");
+                       elm_object_text_set(bt, "Box");
                        evas_object_size_hint_align_set(bt, EVAS_HINT_FILL,
                                                        EVAS_HINT_FILL);
                        evas_object_size_hint_weight_set(bt, 0.0, 0.0);
@@ -232,7 +232,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
                     {
                        Evas_Object *bt;
                        bt = elm_button_add(win);
-                       elm_button_label_set(bt, "BX Scroller");
+                       elm_object_text_set(bt, "BX Scroller");
                        evas_object_size_hint_align_set(bt, EVAS_HINT_FILL,
                                                        EVAS_HINT_FILL);
                        evas_object_size_hint_weight_set(bt, 0.0, 0.0);
@@ -266,7 +266,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
                {
                   Evas_Object *bt;
                   bt = elm_button_add(win);
-                  elm_button_label_set(bt, "Layout");
+                  elm_object_text_set(bt, "Layout");
                   evas_object_size_hint_align_set(bt, EVAS_HINT_FILL,
                                                   EVAS_HINT_FILL);
                   evas_object_size_hint_weight_set(bt, 0.0, 0.0);
@@ -287,7 +287,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
                {
                   Evas_Object *bt;
                   bt = elm_button_add(win);
-                  elm_button_label_set(bt, "Disable");
+                  elm_object_text_set(bt, "Disable");
                   evas_object_size_hint_align_set(bt, EVAS_HINT_FILL,
                                                   EVAS_HINT_FILL);
                   evas_object_size_hint_weight_set(bt, 0.0, 0.0);
@@ -298,7 +298,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
                   Evas_Object *bt2;
                   bt2 = elm_button_add(win);
-                  elm_button_label_set(bt2, "Enable");
+                  elm_object_text_set(bt2, "Enable");
                   evas_object_size_hint_align_set(bt2, EVAS_HINT_FILL,
                                                   EVAS_HINT_FILL);
                   evas_object_size_hint_weight_set(bt2, 0.0, 0.0);
@@ -334,7 +334,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
                       {
                          Evas_Object *bt;
                          bt = elm_button_add(win);
-                         elm_button_label_set(bt, "Table");
+                         elm_object_text_set(bt, "Table");
                          evas_object_size_hint_align_set(bt, EVAS_HINT_FILL,
                                                          EVAS_HINT_FILL);
                          evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -363,7 +363,7 @@ test_focus(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
                       {
                          Evas_Object *bt;
                          bt = elm_button_add(win);
-                         elm_button_label_set(bt, "Table");
+                         elm_object_text_set(bt, "Table");
                          evas_object_size_hint_align_set(bt, EVAS_HINT_FILL,
                                                          EVAS_HINT_FILL);
                          evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

diff --git a/src/bin/test_focus2.c b/src/bin/test_focus2.c
index 29f484d..9a3532d 100644 (file)
--- a/src/bin/test_focus2.c
+++ b/src/bin/test_focus2.c
@@ -86,7 +86,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_box_pack_end(bx, en);
 
    bt = elm_button_add(PARENT);
-   elm_button_label_set(bt, "Give focus to scrolled entry");
+   elm_object_text_set(bt, "Give focus to scrolled entry");
    evas_object_smart_callback_add(bt, "clicked", _focus_obj, en);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -99,7 +99,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(ly);
 
    bt1 = bt = elm_button_add(ly);
-   elm_button_label_set(bt, "Button 1");
+   elm_object_text_set(bt, "Button 1");
    elm_layout_content_set(ly, "element1", bt);
 
    en = elm_entry_add(ly);
@@ -112,11 +112,11 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_layout_content_set(ly, "element2", en);
 
    bt = elm_button_add(ly);
-   elm_button_label_set(bt, "Button 2");
+   elm_object_text_set(bt, "Button 2");
    elm_layout_content_set(ly, "element3", bt);
 
    bt = elm_button_add(PARENT);
-   elm_button_label_set(bt, "Give focus to layout");
+   elm_object_text_set(bt, "Give focus to layout");
    evas_object_smart_callback_add(bt, "clicked", _focus_obj, ly);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
@@ -124,7 +124,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(PARENT);
-   elm_button_label_set(bt, "Give focus to layout part");
+   elm_object_text_set(bt, "Give focus to layout part");
    evas_object_smart_callback_add(bt, "clicked", _focus_layout_part, ly);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
@@ -132,7 +132,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(PARENT);
-   elm_button_label_set(bt, "Give focus to layout 'Button 1'");
+   elm_object_text_set(bt, "Give focus to layout 'Button 1'");
    evas_object_smart_callback_add(bt, "clicked", _focus_obj, bt1);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
@@ -140,7 +140,7 @@ test_focus2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(PARENT);
-   elm_button_label_set(bt, "Give focus to layout 'Entry'");
+   elm_object_text_set(bt, "Give focus to layout 'Entry'");
    evas_object_smart_callback_add(bt, "clicked", _focus_obj, en);
    evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);

diff --git a/src/bin/test_focus3.c b/src/bin/test_focus3.c
index a6efbaf..8318718 100644 (file)
--- a/src/bin/test_focus3.c
+++ b/src/bin/test_focus3.c
@@ -84,7 +84,7 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    bt = elm_button_add(win);
    elm_object_focus_allow_set(bt, 0);
-   elm_button_label_set(bt, "Add");
+   elm_object_text_set(bt, "Add");
    evas_object_smart_callback_add(bt, "clicked", _add, bx);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5);
@@ -93,7 +93,7 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    bt = elm_button_add(win);
    elm_object_focus_allow_set(bt, 0);
-   elm_button_label_set(bt, "Del");
+   elm_object_text_set(bt, "Del");
    evas_object_smart_callback_add(bt, "clicked", _del, NULL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5);
@@ -102,7 +102,7 @@ test_focus3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    bt = elm_button_add(win);
    elm_object_focus_allow_set(bt, 0);
-   elm_button_label_set(bt, "Hide");
+   elm_object_text_set(bt, "Hide");
    evas_object_smart_callback_add(bt, "clicked", _hide, NULL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5);

diff --git a/src/bin/test_gengrid.c b/src/bin/test_gengrid.c
index 782c6dc..e18a3fd 100644 (file)
--- a/src/bin/test_gengrid.c
+++ b/src/bin/test_gengrid.c
@@ -315,25 +315,25 @@ test_gengrid2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(hbx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Append");
+   elm_object_text_set(bt, "Append");
    evas_object_smart_callback_add(bt, "clicked", _append_bt_clicked, grid);
    elm_box_pack_end(hbx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Prepend");
+   elm_object_text_set(bt, "Prepend");
    evas_object_smart_callback_add(bt, "clicked", _prepend_bt_clicked, grid);
    elm_box_pack_end(hbx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Insert before");
+   elm_object_text_set(bt, "Insert before");
    evas_object_smart_callback_add(bt, "clicked", _before_bt_clicked, grid);
    elm_box_pack_end(hbx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Insert after");
+   elm_object_text_set(bt, "Insert after");
    evas_object_smart_callback_add(bt, "clicked", _after_bt_clicked, grid);
    elm_box_pack_end(hbx, bt);
    evas_object_show(bt);

diff --git a/src/bin/test_genlist.c b/src/bin/test_genlist.c
index 101bb7b..4ce3e2d 100644 (file)
--- a/src/bin/test_genlist.c
+++ b/src/bin/test_genlist.c
@@ -147,12 +147,12 @@ test_genlist(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    itc1.func.del       = gl_del;
 
    bt_50 = elm_button_add(win);
-   elm_button_label_set(bt_50, "Go to 50");
+   elm_object_text_set(bt_50, "Go to 50");
    evas_object_show(bt_50);
    elm_box_pack_end(bx, bt_50);
 
    bt_1500 = elm_button_add(win);
-   elm_button_label_set(bt_1500, "Go to 1500");
+   elm_object_text_set(bt_1500, "Go to 1500");
    evas_object_show(bt_1500);
    elm_box_pack_end(bx, bt_1500);
 
@@ -404,7 +404,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "/\\");
+   elm_object_text_set(bt, "/\\");
    evas_object_smart_callback_add(bt, "clicked", my_gl_first, gl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -412,7 +412,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "\\/");
+   elm_object_text_set(bt, "\\/");
    evas_object_smart_callback_add(bt, "clicked", my_gl_last, gl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -420,7 +420,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "#");
+   elm_object_text_set(bt, "#");
    evas_object_smart_callback_add(bt, "clicked", my_gl_disable, gl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -428,7 +428,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "U");
+   elm_object_text_set(bt, "U");
    evas_object_smart_callback_add(bt, "clicked", my_gl_update_all, gl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -445,7 +445,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "X");
+   elm_object_text_set(bt, "X");
    evas_object_smart_callback_add(bt, "clicked", my_gl_clear, gl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -453,7 +453,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "+");
+   elm_object_text_set(bt, "+");
    evas_object_smart_callback_add(bt, "clicked", my_gl_add, gl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -461,7 +461,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "-");
+   elm_object_text_set(bt, "-");
    evas_object_smart_callback_add(bt, "clicked", my_gl_del, gl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -478,7 +478,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_size_hint_align_set(bx3, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "+ before");
+   elm_object_text_set(bt, "+ before");
    evas_object_smart_callback_add(bt, "clicked", my_gl_insert_before, gl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -486,7 +486,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "+ after");
+   elm_object_text_set(bt, "+ after");
    evas_object_smart_callback_add(bt, "clicked", my_gl_insert_after, gl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -494,7 +494,7 @@ test_genlist2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Flush");
+   elm_object_text_set(bt, "Flush");
    evas_object_smart_callback_add(bt, "clicked", my_gl_flush, gl);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -621,7 +621,7 @@ test_genlist3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[1]");
+   elm_object_text_set(bt, "[1]");
    evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[0]));
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -629,7 +629,7 @@ test_genlist3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[2]");
+   elm_object_text_set(bt, "[2]");
    evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[1]));
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -637,7 +637,7 @@ test_genlist3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[3]");
+   elm_object_text_set(bt, "[3]");
    evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[2]));
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -757,7 +757,7 @@ test_genlist4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[1]");
+   elm_object_text_set(bt, "[1]");
    evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[0]));
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -765,7 +765,7 @@ test_genlist4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[2]");
+   elm_object_text_set(bt, "[2]");
    evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[1]));
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -773,7 +773,7 @@ test_genlist4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[3]");
+   elm_object_text_set(bt, "[3]");
    evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[2]));
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -988,7 +988,7 @@ test_genlist5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[1]");
+   elm_object_text_set(bt, "[1]");
    evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[0]));
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -996,7 +996,7 @@ test_genlist5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[2]");
+   elm_object_text_set(bt, "[2]");
    evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[1]));
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1004,7 +1004,7 @@ test_genlist5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[3]");
+   elm_object_text_set(bt, "[3]");
    evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[2]));
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1163,7 +1163,7 @@ test_genlist6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[1]");
+   elm_object_text_set(bt, "[1]");
    //   evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[0]));
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1171,7 +1171,7 @@ test_genlist6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[2]");
+   elm_object_text_set(bt, "[2]");
    //   evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[1]));
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1179,7 +1179,7 @@ test_genlist6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "[3]");
+   elm_object_text_set(bt, "[3]");
    //   evas_object_smart_callback_add(bt, "clicked", my_gl_update, &(tit[2]));
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -1242,7 +1242,7 @@ test_genlist7_swipe(void *data, Evas_Object *obj __UNUSED__, void *event_info)
    evas_object_show(entry);
 
    button = elm_button_add(info->win);
-   elm_button_label_set(button, "back");
+   elm_object_text_set(button, "back");
    evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 0);
    evas_object_size_hint_align_set(button, EVAS_HINT_FILL, 0);
    evas_object_smart_callback_add(button, "clicked", test_genlist7_back_cb,
@@ -1393,28 +1393,28 @@ test_genlist8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    bt_num = 0;
    bt[bt_num] = elm_button_add(win);
-   elm_button_label_set(bt[bt_num], "Show 0");
+   elm_object_text_set(bt[bt_num], "Show 0");
    evas_object_size_hint_align_set(bt[bt_num], EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt[bt_num], EVAS_HINT_EXPAND, 0.0);
    evas_object_show(bt[bt_num]);
    elm_box_pack_end(bx2, bt[bt_num]);
 
    bt[++bt_num] = elm_button_add(win);
-   elm_button_label_set(bt[bt_num], "Show 26");
+   elm_object_text_set(bt[bt_num], "Show 26");
    evas_object_size_hint_align_set(bt[bt_num], EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt[bt_num], EVAS_HINT_EXPAND, 0.0);
    evas_object_show(bt[bt_num]);
    elm_box_pack_end(bx2, bt[bt_num]);
 
    bt[++bt_num] = elm_button_add(win);
-   elm_button_label_set(bt[bt_num], "Show 101");
+   elm_object_text_set(bt[bt_num], "Show 101");
    evas_object_size_hint_align_set(bt[bt_num], EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt[bt_num], EVAS_HINT_EXPAND, 0.0);
    evas_object_show(bt[bt_num]);
    elm_box_pack_end(bx2, bt[bt_num]);
 
    bt[++bt_num] = elm_button_add(win);
-   elm_button_label_set(bt[bt_num], "Show 480");
+   elm_object_text_set(bt[bt_num], "Show 480");
    evas_object_size_hint_align_set(bt[bt_num], EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt[bt_num], EVAS_HINT_EXPAND, 0.0);
    evas_object_show(bt[bt_num]);
@@ -1430,28 +1430,28 @@ test_genlist8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_size_hint_align_set(bx3, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt[++bt_num] = elm_button_add(win);
-   elm_button_label_set(bt[bt_num], "Bring top 0");
+   elm_object_text_set(bt[bt_num], "Bring top 0");
    evas_object_size_hint_align_set(bt[bt_num], EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt[bt_num], EVAS_HINT_EXPAND, 0.0);
    evas_object_show(bt[bt_num]);
    elm_box_pack_end(bx3, bt[bt_num]);
 
    bt[++bt_num] = elm_button_add(win);
-   elm_button_label_set(bt[bt_num], "Bring top 31");
+   elm_object_text_set(bt[bt_num], "Bring top 31");
    evas_object_size_hint_align_set(bt[bt_num], EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt[bt_num], EVAS_HINT_EXPAND, 0.0);
    evas_object_show(bt[bt_num]);
    elm_box_pack_end(bx3, bt[bt_num]);
 
    bt[++bt_num] = elm_button_add(win);
-   elm_button_label_set(bt[bt_num], "Bring top 239");
+   elm_object_text_set(bt[bt_num], "Bring top 239");
    evas_object_size_hint_align_set(bt[bt_num], EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt[bt_num], EVAS_HINT_EXPAND, 0.0);
    evas_object_show(bt[bt_num]);
    elm_box_pack_end(bx3, bt[bt_num]);
 
    bt[++bt_num] = elm_button_add(win);
-   elm_button_label_set(bt[bt_num], "Bring top 477");
+   elm_object_text_set(bt[bt_num], "Bring top 477");
    evas_object_size_hint_align_set(bt[bt_num], EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt[bt_num], EVAS_HINT_EXPAND, 0.0);
    evas_object_show(bt[bt_num]);

diff --git a/src/bin/test_glview.c b/src/bin/test_glview.c
index 3f495e1..9774f1a 100644 (file)
--- a/src/bin/test_glview.c
+++ b/src/bin/test_glview.c
@@ -620,7 +620,7 @@ test_glview(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    /* add an ok button */
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "OK");
+   elm_object_text_set(bt, "OK");
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); 
    elm_box_pack_end(bx, bt);

diff --git a/src/bin/test_glview_simple.c b/src/bin/test_glview_simple.c
index ad24fe4..28d9e16 100644 (file)
--- a/src/bin/test_glview_simple.c
+++ b/src/bin/test_glview_simple.c
@@ -275,7 +275,7 @@ test_glview_simple(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *eve
    evas_object_event_callback_add(gl, EVAS_CALLBACK_DEL, _del, gl);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "OK");
+   elm_object_text_set(bt, "OK");
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    elm_box_pack_end(bx, bt);

diff --git a/src/bin/test_grid.c b/src/bin/test_grid.c
index 60378cf..b7a7474 100644 (file)
--- a/src/bin/test_grid.c
+++ b/src/bin/test_grid.c
@@ -47,27 +47,27 @@ test_grid(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info _
    evas_object_show(en);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button");
+   elm_object_text_set(bt, "Button");
    elm_grid_pack(gd, bt,  0,  0, 20, 20);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button");
+   elm_object_text_set(bt, "Button");
    elm_grid_pack(gd, bt, 10, 10, 40, 20);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button");
+   elm_object_text_set(bt, "Button");
    elm_grid_pack(gd, bt, 10, 30, 20, 50);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button");
+   elm_object_text_set(bt, "Button");
    elm_grid_pack(gd, bt, 80, 80, 20, 20);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Change");
+   elm_object_text_set(bt, "Change");
    elm_grid_pack(gd, bt, 40, 40, 20, 20);
    evas_object_smart_callback_add(bt, "clicked", _ch_grid, gd);
    evas_object_show(bt);

diff --git a/src/bin/test_hover.c b/src/bin/test_hover.c
index f4b597c..eb3785f 100644 (file)
--- a/src/bin/test_hover.c
+++ b/src/bin/test_hover.c
@@ -32,7 +32,7 @@ test_hover(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    hv = elm_hover_add(win);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button");
+   elm_object_text_set(bt, "Button");
    evas_object_smart_callback_add(bt, "clicked", my_hover_bt, hv);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -40,7 +40,7 @@ test_hover(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_hover_target_set(hv, bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Popup");
+   elm_object_text_set(bt, "Popup");
    elm_hover_content_set(hv, "middle", bt);
    evas_object_show(bt);
 
@@ -54,15 +54,15 @@ test_hover(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(ic);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Top 1");
+   elm_object_text_set(bt, "Top 1");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Top 2");
+   elm_object_text_set(bt, "Top 2");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Top 3");
+   elm_object_text_set(bt, "Top 3");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
@@ -70,17 +70,17 @@ test_hover(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_hover_content_set(hv, "top", bx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Bottom");
+   elm_object_text_set(bt, "Bottom");
    elm_hover_content_set(hv, "bottom", bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Left");
+   elm_object_text_set(bt, "Left");
    elm_hover_content_set(hv, "left", bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Right");
+   elm_object_text_set(bt, "Right");
    elm_hover_content_set(hv, "right", bt);
    evas_object_show(bt);
 
@@ -114,7 +114,7 @@ test_hover2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_object_style_set(hv, "popout");
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button");
+   elm_object_text_set(bt, "Button");
    evas_object_smart_callback_add(bt, "clicked", my_hover_bt, hv);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -122,7 +122,7 @@ test_hover2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_hover_target_set(hv, bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Popup");
+   elm_object_text_set(bt, "Popup");
    elm_hover_content_set(hv, "middle", bt);
    evas_object_show(bt);
 
@@ -135,32 +135,32 @@ test_hover2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_box_pack_end(bx, ic);
    evas_object_show(ic);
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Top 1");
+   elm_object_text_set(bt, "Top 1");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Top 2");
+   elm_object_text_set(bt, "Top 2");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Top 3");
+   elm_object_text_set(bt, "Top 3");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
    evas_object_show(bx);
    elm_hover_content_set(hv, "top", bx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Bot");
+   elm_object_text_set(bt, "Bot");
    elm_hover_content_set(hv, "bottom", bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Left");
+   elm_object_text_set(bt, "Left");
    elm_hover_content_set(hv, "left", bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Right");
+   elm_object_text_set(bt, "Right");
    elm_hover_content_set(hv, "right", bt);
    evas_object_show(bt);
 

diff --git a/src/bin/test_index.c b/src/bin/test_index.c
index 7c57f67..a0dfc9e 100644 (file)
--- a/src/bin/test_index.c
+++ b/src/bin/test_index.c
@@ -233,7 +233,7 @@ test_index2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(gui->entry);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Add");
+   elm_object_text_set(bt, "Add");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_box_pack_end(box, bt);

diff --git a/src/bin/test_launcher.c b/src/bin/test_launcher.c
index 925a8e9..e27990d 100644 (file)
--- a/src/bin/test_launcher.c
+++ b/src/bin/test_launcher.c
@@ -363,7 +363,7 @@ test_launcher(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(ck);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close");
+   elm_object_text_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", close_cb, win);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.95, 0.99);
@@ -407,17 +407,17 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
         evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 
         bt = elm_button_add(win);
-        elm_button_label_set(bt, "Button 1");
+        elm_object_text_set(bt, "Button 1");
         elm_layout_content_set(ly, "element1", bt);
         evas_object_show(bt);
 
         bt = elm_button_add(win);
-        elm_button_label_set(bt, "Button 2");
+        elm_object_text_set(bt, "Button 2");
         elm_layout_content_set(ly, "element2", bt);
         evas_object_show(bt);
 
         bt = elm_button_add(win);
-        elm_button_label_set(bt, "Button 3");
+        elm_object_text_set(bt, "Button 3");
         elm_layout_content_set(ly, "element3", bt);
         evas_object_show(bt);
 
@@ -487,7 +487,7 @@ test_launcher2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(ck);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close");
+   elm_object_text_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", close_cb, win);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.95, 0.99);
@@ -907,7 +907,7 @@ test_launcher3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(ck);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close");
+   elm_object_text_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", l3_close_cb, win);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.95, 0.99);

diff --git a/src/bin/test_layout.c b/src/bin/test_layout.c
index 21beec3..34ae871 100644 (file)
--- a/src/bin/test_layout.c
+++ b/src/bin/test_layout.c
@@ -8,7 +8,7 @@
 static void
 _clicked_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
-   elm_layout_text_set(data, "text", elm_button_label_get(obj));
+   elm_layout_text_set(data, "text", elm_object_text_get(obj));
 }
 
 void
@@ -59,19 +59,19 @@ test_layout(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(ly);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 1");
+   elm_object_text_set(bt, "Button 1");
    elm_layout_content_set(ly, "element1", bt);
    evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 2");
+   elm_object_text_set(bt, "Button 2");
    elm_layout_content_set(ly, "element2", bt);
    evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 3");
+   elm_object_text_set(bt, "Button 3");
    elm_layout_content_set(ly, "element3", bt);
    evas_object_smart_callback_add(bt, "clicked", _clicked_cb, ly);
    evas_object_show(bt);

diff --git a/src/bin/test_list.c b/src/bin/test_list.c
index cf9146b..0d84879 100644 (file)
--- a/src/bin/test_list.c
+++ b/src/bin/test_list.c
@@ -140,7 +140,7 @@ test_list(void        *data __UNUSED__,
    elm_win_resize_object_add(win, tb2);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Hello");
+   elm_object_text_set(bt, "Hello");
    evas_object_smart_callback_add(bt, "clicked", my_show_it, it1);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.9, 0.5);
@@ -148,7 +148,7 @@ test_list(void        *data __UNUSED__,
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "How");
+   elm_object_text_set(bt, "How");
    evas_object_smart_callback_add(bt, "clicked", my_show_it, it2);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.9, 0.5);
@@ -156,7 +156,7 @@ test_list(void        *data __UNUSED__,
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "doing");
+   elm_object_text_set(bt, "doing");
    evas_object_smart_callback_add(bt, "clicked", my_show_it, it3);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.9, 0.5);
@@ -164,7 +164,7 @@ test_list(void        *data __UNUSED__,
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Here");
+   elm_object_text_set(bt, "Here");
    evas_object_smart_callback_add(bt, "clicked", my_show_it, it4);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.9, 0.5);
@@ -172,7 +172,7 @@ test_list(void        *data __UNUSED__,
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Maybe this...");
+   elm_object_text_set(bt, "Maybe this...");
    evas_object_smart_callback_add(bt, "clicked", my_show_it, it5);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.9, 0.5);
@@ -281,7 +281,7 @@ test_list_horizontal(void        *data __UNUSED__,
    elm_win_resize_object_add(win, tb2);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Hello");
+   elm_object_text_set(bt, "Hello");
    evas_object_smart_callback_add(bt, "clicked", my_show_it, it1);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.5, 0.9);
@@ -289,7 +289,7 @@ test_list_horizontal(void        *data __UNUSED__,
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "How");
+   elm_object_text_set(bt, "How");
    evas_object_smart_callback_add(bt, "clicked", my_show_it, it2);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.5, 0.9);
@@ -297,7 +297,7 @@ test_list_horizontal(void        *data __UNUSED__,
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "doing");
+   elm_object_text_set(bt, "doing");
    evas_object_smart_callback_add(bt, "clicked", my_show_it, it3);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.5, 0.9);
@@ -305,7 +305,7 @@ test_list_horizontal(void        *data __UNUSED__,
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "And");
+   elm_object_text_set(bt, "And");
    evas_object_smart_callback_add(bt, "clicked", my_show_it, it4);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.5, 0.9);
@@ -437,7 +437,7 @@ test_list2(void        *data __UNUSED__,
    evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Clear");
+   elm_object_text_set(bt, "Clear");
    evas_object_smart_callback_add(bt, "clicked", my_li2_clear, li);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -496,7 +496,7 @@ test_list3(void        *data __UNUSED__,
    elm_icon_scale_set(ic, 0, 0);
    elm_icon_file_set(ic, buf, NULL);
    ic2 = elm_button_add(win);
-   elm_button_label_set(ic2, "Click me");
+   elm_object_text_set(ic2, "Click me");
    evas_object_smart_callback_add(ic2, "clicked", _bt_clicked, NULL);
    evas_object_propagate_events_set(ic2, 0);
    elm_list_item_append(li, "Hello", ic, ic2, _it_clicked, NULL);
@@ -506,7 +506,7 @@ test_list3(void        *data __UNUSED__,
    elm_icon_scale_set(ic, 0, 0);
    elm_icon_file_set(ic, buf, NULL);
    ic2 = elm_button_add(win);
-   elm_button_label_set(ic2, "Click me");
+   elm_object_text_set(ic2, "Click me");
    evas_object_smart_callback_add(ic2, "clicked", _bt_clicked, NULL);
    elm_list_item_append(li, "world", ic, ic2, _it_clicked, NULL);
 
@@ -619,7 +619,7 @@ test_list4_swipe(void        *data,
    evas_object_show(entry);
 
    button = elm_button_add(info->win);
-   elm_button_label_set(button, "back");
+   elm_object_text_set(button, "back");
    evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 0);
    evas_object_size_hint_align_set(button, EVAS_HINT_FILL, 0);
    evas_object_smart_callback_add(button, "clicked", test_list4_back_cb, info);
@@ -755,7 +755,7 @@ test_list5_swipe(void        *data __UNUSED__,
    if (elm_list_item_end_get(event_info)) return;
 
    button = elm_button_add(info->win);
-   elm_button_label_set(button, "delete");
+   elm_object_text_set(button, "delete");
    evas_object_propagate_events_set(button, 0);
    evas_object_smart_callback_add(button, "clicked", test_list5_item_del,
                                   event_info);

diff --git a/src/bin/test_multi.c b/src/bin/test_multi.c
index 126e02f..8c38bbd 100644 (file)
--- a/src/bin/test_multi.c
+++ b/src/bin/test_multi.c
@@ -119,7 +119,7 @@ test_multi(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Rotate");
+   elm_object_text_set(bt, "Rotate");
    evas_object_smart_callback_add(bt, "clicked", my_bt_rot, win);
    evas_object_size_hint_align_set(bt, 0.0, 0.0);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);

diff --git a/src/bin/test_notify.c b/src/bin/test_notify.c
index 91e6df7..71c1b22 100644 (file)
--- a/src/bin/test_notify.c
+++ b/src/bin/test_notify.c
@@ -70,13 +70,13 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close");
+   elm_object_text_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", _bt_close, notify);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Top");
+   elm_object_text_set(bt, "Top");
    evas_object_smart_callback_add(bt, "clicked", _bt, notify);
    elm_table_pack(tb, bt, 1, 0, 1, 1);
    evas_object_show(bt);
@@ -101,13 +101,13 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close");
+   elm_object_text_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", _bt_close, notify);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Bottom");
+   elm_object_text_set(bt, "Bottom");
    evas_object_smart_callback_add(bt, "clicked", _bt, notify);
    elm_table_pack(tb, bt, 1, 2, 1, 1);
    evas_object_show(bt);
@@ -129,13 +129,13 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close");
+   elm_object_text_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", _bt_close, notify);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Left");
+   elm_object_text_set(bt, "Left");
    evas_object_smart_callback_add(bt, "clicked", _bt, notify);
    elm_table_pack(tb, bt, 0, 1, 1, 1);
    evas_object_show(bt);
@@ -157,13 +157,13 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close");
+   elm_object_text_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", _bt_close, notify);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Center");
+   elm_object_text_set(bt, "Center");
    evas_object_smart_callback_add(bt, "clicked", _bt, notify);
    elm_table_pack(tb, bt, 1, 1, 1, 1);
    evas_object_show(bt);
@@ -183,13 +183,13 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close");
+   elm_object_text_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", _bt_close, notify);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Right");
+   elm_object_text_set(bt, "Right");
    evas_object_smart_callback_add(bt, "clicked", _bt, notify);
    elm_table_pack(tb, bt, 2, 1, 1, 1);
    evas_object_show(bt);
@@ -209,13 +209,13 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close");
+   elm_object_text_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", _bt_close, notify);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Top Left");
+   elm_object_text_set(bt, "Top Left");
    evas_object_smart_callback_add(bt, "clicked", _bt, notify);
    elm_table_pack(tb, bt, 0, 0, 1, 1);
    evas_object_show(bt);
@@ -235,13 +235,13 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close");
+   elm_object_text_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", _bt_close, notify);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Top Right");
+   elm_object_text_set(bt, "Top Right");
    evas_object_smart_callback_add(bt, "clicked", _bt, notify);
    elm_table_pack(tb, bt, 2, 0, 1, 1);
    evas_object_show(bt);
@@ -261,13 +261,13 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close");
+   elm_object_text_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", _bt_close, notify);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Bottom Left");
+   elm_object_text_set(bt, "Bottom Left");
    evas_object_smart_callback_add(bt, "clicked", _bt, notify);
    elm_table_pack(tb, bt, 0, 2, 1, 1);
    evas_object_show(bt);
@@ -287,13 +287,13 @@ test_notify(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close in 2s");
+   elm_object_text_set(bt, "Close in 2s");
    evas_object_smart_callback_add(bt, "clicked", _bt_timer_close, notify);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Bottom Right");
+   elm_object_text_set(bt, "Bottom Right");
    evas_object_smart_callback_add(bt, "clicked", _bt, notify);
    elm_table_pack(tb, bt, 2, 2, 1, 1);
    evas_object_show(bt);

diff --git a/src/bin/test_pager.c b/src/bin/test_pager.c
index a8a988f..8b923d0 100644 (file)
--- a/src/bin/test_pager.c
+++ b/src/bin/test_pager.c
@@ -131,13 +131,13 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    elm_radio_value_set(rd, 0);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Flip to 2");
+   elm_object_text_set(bt, "Flip to 2");
    evas_object_smart_callback_add(bt, "clicked", my_pager_1, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Popme");
+   elm_object_text_set(bt, "Popme");
    evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -159,13 +159,13 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Flip to 3");
+   elm_object_text_set(bt, "Flip to 3");
    evas_object_smart_callback_add(bt, "clicked", my_pager_2, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Popme");
+   elm_object_text_set(bt, "Popme");
    evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -186,13 +186,13 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Flip to 1");
+   elm_object_text_set(bt, "Flip to 1");
    evas_object_smart_callback_add(bt, "clicked", my_pager_3, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Popme");
+   elm_object_text_set(bt, "Popme");
    evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -219,13 +219,13 @@ test_pager(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Flip to 1");
+   elm_object_text_set(bt, "Flip to 1");
    evas_object_smart_callback_add(bt, "clicked", my_pager_4, &info);
    elm_layout_content_set(ly2, "element1", bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Popme");
+   elm_object_text_set(bt, "Popme");
    evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
    evas_object_show(bt);
    elm_layout_content_set(ly2, "element2", bt);
@@ -259,13 +259,13 @@ my_pager_push(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
    evas_object_show(lb);
 
    bt = elm_button_add(info->win);
-   elm_button_label_set(bt, "Push a new page");
+   elm_object_text_set(bt, "Push a new page");
    evas_object_smart_callback_add(bt, "clicked", my_pager_push, info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(info->win);
-   elm_button_label_set(bt, "Go back (pop)");
+   elm_object_text_set(bt, "Go back (pop)");
    evas_object_smart_callback_add(bt, "clicked", my_pager_pop, info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -313,13 +313,13 @@ test_pager_slide(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    evas_object_show(lb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Push a new page");
+   elm_object_text_set(bt, "Push a new page");
    evas_object_smart_callback_add(bt, "clicked", my_pager_push, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Go back (pop)");
+   elm_object_text_set(bt, "Go back (pop)");
    evas_object_smart_callback_add(bt, "clicked", my_pager_pop, &info);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);

diff --git a/src/bin/test_panes.c b/src/bin/test_panes.c
index b0800d6..69c4788 100644 (file)
--- a/src/bin/test_panes.c
+++ b/src/bin/test_panes.c
@@ -69,7 +69,7 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    //
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Left");
+   elm_object_text_set(bt, "Left");
    evas_object_size_hint_weight_set(bt, 1.0, 1.0);
    evas_object_size_hint_align_set(bt, -1.0, -1.0);
    evas_object_show(bt);
@@ -93,7 +93,7 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    //
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Up");
+   elm_object_text_set(bt, "Up");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(bt);
@@ -102,7 +102,7 @@ test_panes(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
 
    //
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Down");
+   elm_object_text_set(bt, "Down");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_show(bt);

diff --git a/src/bin/test_photocam.c b/src/bin/test_photocam.c
index 97891f5..7117e24 100644 (file)
--- a/src/bin/test_photocam.c
+++ b/src/bin/test_photocam.c
@@ -271,7 +271,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    elm_win_resize_object_add(win, tb2);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Z -");
+   elm_object_text_set(bt, "Z -");
    evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_out, ph);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.1, 0.1);
@@ -287,7 +287,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Z +");
+   elm_object_text_set(bt, "Z +");
    evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_in, ph);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.9, 0.1);
@@ -295,7 +295,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Show 30,50 500x300");
+   elm_object_text_set(bt, "Show 30,50 500x300");
    evas_object_smart_callback_add(bt, "clicked", my_bt_show_reg, ph);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.1, 0.5);
@@ -303,7 +303,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Bring 800,300 500x300");
+   elm_object_text_set(bt, "Bring 800,300 500x300");
    evas_object_smart_callback_add(bt, "clicked", my_bt_bring_reg, ph);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.9, 0.5);
@@ -311,7 +311,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Pause On/Off");
+   elm_object_text_set(bt, "Pause On/Off");
    evas_object_smart_callback_add(bt, "clicked", my_bt_pause, ph);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.1, 0.9);
@@ -319,7 +319,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Fit");
+   elm_object_text_set(bt, "Fit");
    evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_fit, ph);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.5, 0.9);
@@ -327,7 +327,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Fill");
+   elm_object_text_set(bt, "Fill");
    evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_fill, ph);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.9, 0.9);

diff --git a/src/bin/test_progressbar.c b/src/bin/test_progressbar.c
index 25c509c..6a05333 100644 (file)
--- a/src/bin/test_progressbar.c
+++ b/src/bin/test_progressbar.c
@@ -189,13 +189,13 @@ test_progressbar(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event
    evas_object_show(bt_bx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Start");
+   elm_object_text_set(bt, "Start");
    evas_object_smart_callback_add(bt, "clicked", my_progressbar_test_start, NULL);
    elm_box_pack_end(bt_bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Stop");
+   elm_object_text_set(bt, "Stop");
    evas_object_smart_callback_add(bt, "clicked", my_progressbar_test_stop, NULL);
    elm_box_pack_end(bt_bx, bt);
    evas_object_show(bt);

diff --git a/src/bin/test_scaling.c b/src/bin/test_scaling.c
index ffa4734..48075e9 100644 (file)
--- a/src/bin/test_scaling.c
+++ b/src/bin/test_scaling.c
@@ -23,37 +23,37 @@ test_scaling(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    evas_object_show(bx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Scale: 0.5");
+   elm_object_text_set(bt, "Scale: 0.5");
    elm_object_scale_set(bt, 0.5);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Scale: 0.75");
+   elm_object_text_set(bt, "Scale: 0.75");
    elm_object_scale_set(bt, 0.75);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Scale: 1.0");
+   elm_object_text_set(bt, "Scale: 1.0");
    elm_object_scale_set(bt, 1.0);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Scale: 1.5");
+   elm_object_text_set(bt, "Scale: 1.5");
    elm_object_scale_set(bt, 1.5);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Scale: 2.0");
+   elm_object_text_set(bt, "Scale: 2.0");
    elm_object_scale_set(bt, 2.0);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Scale: 3.0");
+   elm_object_text_set(bt, "Scale: 3.0");
    elm_object_scale_set(bt, 3.0);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);

diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c
index f031385..ea0fe4c 100644 (file)
--- a/src/bin/test_scroller.c
+++ b/src/bin/test_scroller.c
@@ -93,7 +93,7 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    elm_win_resize_object_add(win, tb2);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "to 300 300");
+   elm_object_text_set(bt, "to 300 300");
    evas_object_smart_callback_add(bt, "clicked", my_bt_go_300_300, sc);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.1, 0.1);
@@ -101,7 +101,7 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "to 900 300");
+   elm_object_text_set(bt, "to 900 300");
    evas_object_smart_callback_add(bt, "clicked", my_bt_go_900_300, sc);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.9, 0.1);
@@ -109,7 +109,7 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "to 300 900");
+   elm_object_text_set(bt, "to 300 900");
    evas_object_smart_callback_add(bt, "clicked", my_bt_go_300_900, sc);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.1, 0.9);
@@ -117,7 +117,7 @@ test_scroller(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "to 900 900");
+   elm_object_text_set(bt, "to 900 900");
    evas_object_smart_callback_add(bt, "clicked", my_bt_go_900_900, sc);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, 0.9, 0.9);
@@ -159,7 +159,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    for (i = 0; i < 3; i++)
      {
         bt = elm_button_add(win);
-        elm_button_label_set(bt, "Vertical");
+        elm_object_text_set(bt, "Vertical");
         evas_object_smart_callback_add(bt, "clicked", click_through, NULL);
         evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
         evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5);
@@ -183,7 +183,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    for (i = 0; i < 10; i++)
      {
         bt = elm_button_add(win);
-        elm_button_label_set(bt, "... Horizontal scrolling ...");
+        elm_object_text_set(bt, "... Horizontal scrolling ...");
         evas_object_smart_callback_add(bt, "clicked", click_through, NULL);
         elm_box_pack_end(bx2, bt);
         evas_object_show(bt);
@@ -197,7 +197,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    for (i = 0; i < 3; i++)
      {
         bt = elm_button_add(win);
-        elm_button_label_set(bt, "Vertical");
+        elm_object_text_set(bt, "Vertical");
         evas_object_smart_callback_add(bt, "clicked", click_through, NULL);
         evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
         evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5);
@@ -230,7 +230,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
         for (i = 0; i < 16; i++)
           {
              bt = elm_button_add(win);
-             elm_button_label_set(bt, "Both");
+             elm_object_text_set(bt, "Both");
              evas_object_smart_callback_add(bt, "clicked", click_through, NULL);
              elm_table_pack(tb2, bt, i, j, 1, 1);
              evas_object_show(bt);
@@ -244,7 +244,7 @@ test_scroller2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    for (i = 0; i < 24; i++)
      {
         bt = elm_button_add(win);
-        elm_button_label_set(bt, "Vertical");
+        elm_object_text_set(bt, "Vertical");
         evas_object_smart_callback_add(bt, "clicked", click_through, NULL);
         evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
         evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0.5);

diff --git a/src/bin/test_separator.c b/src/bin/test_separator.c
index 4a5f0e9..4b43ccd 100644 (file)
--- a/src/bin/test_separator.c
+++ b/src/bin/test_separator.c
@@ -29,7 +29,7 @@ test_separator(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(bx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Left upper corner");
+   elm_object_text_set(bt, "Left upper corner");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
@@ -39,7 +39,7 @@ test_separator(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(sp);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Left lower corner");
+   elm_object_text_set(bt, "Left lower corner");
    elm_object_disabled_set(bt, 1);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -54,7 +54,7 @@ test_separator(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(bx);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Right upper corner");
+   elm_object_text_set(bt, "Right upper corner");
    elm_object_disabled_set(bt, 1);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -65,7 +65,7 @@ test_separator(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(sp);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Right lower corner");
+   elm_object_text_set(bt, "Right lower corner");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 

diff --git a/src/bin/test_slideshow.c b/src/bin/test_slideshow.c
index 8465be8..141bc56 100644 (file)
--- a/src/bin/test_slideshow.c
+++ b/src/bin/test_slideshow.c
@@ -152,13 +152,13 @@ test_slideshow(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
                                   notify);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Previous");
+   elm_object_text_set(bt, "Previous");
    evas_object_smart_callback_add(bt, "clicked", _previous, slideshow);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Next");
+   elm_object_text_set(bt, "Next");
    evas_object_smart_callback_add(bt, "clicked", _next, slideshow);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -190,14 +190,14 @@ test_slideshow(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
 
    bt = elm_button_add(win);
    bt_start = bt;
-   elm_button_label_set(bt, "Start");
+   elm_object_text_set(bt, "Start");
    evas_object_smart_callback_add(bt, "clicked", _start, spin);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
    bt_stop = bt;
-   elm_button_label_set(bt, "Stop");
+   elm_object_text_set(bt, "Stop");
    evas_object_smart_callback_add(bt, "clicked", _stop, spin);
    elm_box_pack_end(bx, bt);
    elm_object_disabled_set(bt, EINA_TRUE);

diff --git a/src/bin/test_table.c b/src/bin/test_table.c
index e4ab3f3..c36e5f7 100644 (file)
--- a/src/bin/test_table.c
+++ b/src/bin/test_table.c
@@ -23,42 +23,42 @@ test_table(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(tb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 1");
+   elm_object_text_set(bt, "Button 1");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 0, 0, 1, 1);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 2");
+   elm_object_text_set(bt, "Button 2");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 1, 0, 1, 1);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 3");
+   elm_object_text_set(bt, "Button 3");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 2, 0, 1, 1);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 4");
+   elm_object_text_set(bt, "Button 4");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 0, 1, 2, 1);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 5");
+   elm_object_text_set(bt, "Button 5");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 2, 1, 1, 3);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 6");
+   elm_object_text_set(bt, "Button 6");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 0, 2, 2, 2);
@@ -88,42 +88,42 @@ test_table2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(tb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "A");
+   elm_object_text_set(bt, "A");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 1, 1, 2, 2);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Blah blah blah");
+   elm_object_text_set(bt, "Blah blah blah");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 3, 0, 2, 3);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Hallow");
+   elm_object_text_set(bt, "Hallow");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 0, 3, 10, 1);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "B");
+   elm_object_text_set(bt, "B");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 2, 5, 2, 1);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "C");
+   elm_object_text_set(bt, "C");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 8, 8, 1, 1);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Wide");
+   elm_object_text_set(bt, "Wide");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 1, 7, 7, 2);
@@ -164,7 +164,7 @@ test_table3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(tb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 1");
+   elm_object_text_set(bt, "Button 1");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 0, 0, 1, 1);
@@ -173,7 +173,7 @@ test_table3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 2");
+   elm_object_text_set(bt, "Button 2");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 1, 0, 1, 1);
@@ -182,7 +182,7 @@ test_table3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 3");
+   elm_object_text_set(bt, "Button 3");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 0, 1, 1, 1);
@@ -214,7 +214,7 @@ test_table4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(tb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 1");
+   elm_object_text_set(bt, "Button 1");
    evas_object_size_hint_weight_set(bt, 0.25, 0.25);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 0, 0, 1, 1);
@@ -223,7 +223,7 @@ test_table4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 2");
+   elm_object_text_set(bt, "Button 2");
    evas_object_size_hint_weight_set(bt, 0.75, 0.25);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 1, 0, 1, 1);
@@ -232,7 +232,7 @@ test_table4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button 3");
+   elm_object_text_set(bt, "Button 3");
    evas_object_size_hint_weight_set(bt, 0.25, 0.75);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 0, 1, 1, 1);
@@ -264,35 +264,35 @@ test_table5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(tb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "A");
+   elm_object_text_set(bt, "A");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 33, 0, 34, 33);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "B");
+   elm_object_text_set(bt, "B");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 67, 33, 33, 34);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "C");
+   elm_object_text_set(bt, "C");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 33, 67, 34, 33);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "D");
+   elm_object_text_set(bt, "D");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 0, 33, 33, 34);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "X");
+   elm_object_text_set(bt, "X");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 33, 33, 34, 34);
@@ -322,42 +322,42 @@ test_table6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    evas_object_show(tb);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "C");
+   elm_object_text_set(bt, "C");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 1, 1, 2, 2);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "A");
+   elm_object_text_set(bt, "A");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 1, 1, 2, 2);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Blah blah blah");
+   elm_object_text_set(bt, "Blah blah blah");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 3, 0, 2, 3);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Hallow");
+   elm_object_text_set(bt, "Hallow");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 0, 3, 10, 1);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "B");
+   elm_object_text_set(bt, "B");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 1, 1, 1, 1);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Wide");
+   elm_object_text_set(bt, "Wide");
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    elm_table_pack(tb, bt, 1, 7, 7, 2);

diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c
index 220ee10..f937c06 100644 (file)
--- a/src/bin/test_tooltip.c
+++ b/src/bin/test_tooltip.c
@@ -171,14 +171,14 @@ _tt_text_replace_timed(void *data       __UNUSED__,
      {
         ecore_timer_del(timer);
         evas_object_data_del(obj, "test-timer");
-        elm_button_label_set(obj, "Simple text tooltip, click to start"
+        elm_object_text_set(obj, "Simple text tooltip, click to start"
                                   " changed timed");
         return;
      }
 
    timer = ecore_timer_add(1.5, _tt_text_replace_timer_cb, obj);
    evas_object_data_set(obj, "test-timer", timer);
-   elm_button_label_set(obj, "Simple text tooltip, click to stop changed"
+   elm_object_text_set(obj, "Simple text tooltip, click to stop changed"
                              " timed");
 }
 
@@ -241,14 +241,14 @@ _tt_icon_replace_timed(void *data       __UNUSED__,
      {
         ecore_timer_del(timer);
         evas_object_data_del(obj, "test-timer");
-        elm_button_label_set(obj, "Icon tooltip, click to start changed"
+        elm_object_text_set(obj, "Icon tooltip, click to start changed"
                                   " timed");
         return;
      }
 
    timer = ecore_timer_add(1.5, _tt_icon_replace_timer_cb, obj);
    evas_object_data_set(obj, "test-timer", timer);
-   elm_button_label_set(obj, "Icon tooltip, click to stop changed timed");
+   elm_object_text_set(obj, "Icon tooltip, click to stop changed timed");
 }
 
 static Eina_Bool
@@ -270,14 +270,14 @@ _tt_style_replace_timed(void *data       __UNUSED__,
      {
         ecore_timer_del(timer);
         evas_object_data_del(obj, "test-timer");
-        elm_button_label_set(obj, "Icon tooltip style, click to start"
+        elm_object_text_set(obj, "Icon tooltip style, click to start"
                                   " changed timed");
         return;
      }
 
    timer = ecore_timer_add(1.5, _tt_style_replace_timer_cb, obj);
    evas_object_data_set(obj, "test-timer", timer);
-   elm_button_label_set(obj, "Icon tooltip style, click to stop changed"
+   elm_object_text_set(obj, "Icon tooltip style, click to stop changed"
                              " timed");
 }
 
@@ -291,7 +291,7 @@ _tt_visible_lock_toggle(void *data       __UNUSED__,
    locked = !locked;
    if (locked)
      {
-        elm_button_label_set(obj, "Locked tooltip visibility");
+        elm_object_text_set(obj, "Locked tooltip visibility");
         elm_object_tooltip_text_set(obj, "This tooltip is locked"
                                          " visible,<br> click the button"
                                          " to unlock!");
@@ -299,7 +299,7 @@ _tt_visible_lock_toggle(void *data       __UNUSED__,
      }
    else
      {
-        elm_button_label_set(obj, "Unlocked tooltip visibility");
+        elm_object_text_set(obj, "Unlocked tooltip visibility");
         elm_object_tooltip_text_set(obj, "This tooltip is unlocked"
                                          " visible,<br> click the button"
                                          " to lock!");
@@ -348,20 +348,20 @@ test_tooltip(void *data       __UNUSED__,
    elm_toolbar_item_tooltip_style_set(ti, "transparent");
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Simple text tooltip");
+   elm_object_text_set(bt, "Simple text tooltip");
    elm_object_tooltip_text_set(bt, "Simple text tooltip");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Simple text tooltip, click to change");
+   elm_object_text_set(bt, "Simple text tooltip, click to change");
    elm_object_tooltip_text_set(bt, "Initial");
    evas_object_smart_callback_add(bt, "clicked", _tt_text_replace, NULL);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Simple text tooltip, click to start"
+   elm_object_text_set(bt, "Simple text tooltip, click to start"
                             " changed timed");
    elm_object_tooltip_text_set(bt, "Initial");
    evas_object_smart_callback_add(bt, "clicked", _tt_text_replace_timed,
@@ -372,14 +372,14 @@ test_tooltip(void *data       __UNUSED__,
                                   NULL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Icon tooltip");
+   elm_object_text_set(bt, "Icon tooltip");
    elm_object_tooltip_content_cb_set(bt, _tt_icon, (void *)123L,
                                      _tt_icon_del);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Icon tooltip, click to start changed timed");
+   elm_object_text_set(bt, "Icon tooltip, click to start changed timed");
    elm_object_tooltip_content_cb_set(bt, _tt_icon, NULL, NULL);
    evas_object_smart_callback_add(bt, "clicked", _tt_icon_replace_timed,
                                   NULL);
@@ -389,14 +389,14 @@ test_tooltip(void *data       __UNUSED__,
                                   NULL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Transparent Icon tooltip");
+   elm_object_text_set(bt, "Transparent Icon tooltip");
    elm_object_tooltip_content_cb_set(bt, _tt_icon, NULL, NULL);
    elm_object_tooltip_style_set(bt, "transparent");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Icon tooltip style, click to start changed"
+   elm_object_text_set(bt, "Icon tooltip style, click to start changed"
                             " timed");
    elm_object_tooltip_content_cb_set(bt, _tt_icon, NULL, NULL);
    evas_object_smart_callback_add(bt, "clicked", _tt_style_replace_timed,
@@ -407,7 +407,7 @@ test_tooltip(void *data       __UNUSED__,
                                   NULL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Unlocked tooltip visibility");
+   elm_object_text_set(bt, "Unlocked tooltip visibility");
    elm_object_tooltip_text_set(bt, "This tooltip is unlocked visible,<br>"
                                    " click the button to lock!");
    evas_object_smart_callback_add(bt, "clicked", _tt_visible_lock_toggle,

diff --git a/src/bin/test_transit.c b/src/bin/test_transit.c
index a9ed21b..932f1dd 100644 (file)
--- a/src/bin/test_transit.c
+++ b/src/bin/test_transit.c
@@ -254,7 +254,7 @@ test_transit(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    evas_object_size_hint_aspect_set(ic, EVAS_ASPECT_CONTROL_VERTICAL, 1, 1);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "ImageAnimation Effect");
+   elm_object_text_set(bt, "ImageAnimation Effect");
    elm_button_icon_set(bt, ic);
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
@@ -262,14 +262,14 @@ test_transit(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    evas_object_smart_callback_add(bt, "clicked", _transit_image_animation, ic);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Color, Rotation and Translation");
+   elm_object_text_set(bt, "Color, Rotation and Translation");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
    evas_object_smart_callback_add(bt, "clicked",
                                   _transit_rotation_translation_color, NULL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Wipe Effect");
+   elm_object_text_set(bt, "Wipe Effect");
    elm_box_pack_end(bx, bt);
    evas_object_show(bt);
    evas_object_smart_callback_add(bt, "clicked", _transit_wipe, NULL);
@@ -294,7 +294,7 @@ test_transit2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bg);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Resizing Effect");
+   elm_object_text_set(bt, "Resizing Effect");
    evas_object_show(bt);
    evas_object_move(bt, 50, 100);
    evas_object_resize(bt, 100, 50);
@@ -320,13 +320,13 @@ test_transit3(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bg);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Front Button - Flip Effect");
+   elm_object_text_set(bt, "Front Button - Flip Effect");
    evas_object_show(bt);
    evas_object_move(bt, 50, 50);
    evas_object_resize(bt, 200, 200);
 
    bt2 = elm_button_add(win);
-   elm_button_label_set(bt2, "Back Button - Flip Effect");
+   elm_object_text_set(bt2, "Back Button - Flip Effect");
    evas_object_move(bt2, 50, 50);
    evas_object_resize(bt2, 200, 200);
 
@@ -353,7 +353,7 @@ test_transit4(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bg);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Zoom Effect");
+   elm_object_text_set(bt, "Zoom Effect");
    evas_object_resize(bt, 100, 50);
    evas_object_move(bt, 100, 125);
    evas_object_show(bt);
@@ -385,7 +385,7 @@ test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    bt = elm_button_add(win);
    elm_button_icon_set(bt, ic);
-   elm_button_label_set(bt, "Before Button - Blend Effect");
+   elm_object_text_set(bt, "Before Button - Blend Effect");
    evas_object_move(bt, 25, 125);
    evas_object_resize(bt, 250, 50);
    evas_object_show(bt);
@@ -396,7 +396,7 @@ test_transit5(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    bt2 = elm_button_add(win);
    elm_button_icon_set(bt2, ic);
-   elm_button_label_set(bt2, "After Button - Blend Effect");
+   elm_object_text_set(bt2, "After Button - Blend Effect");
    evas_object_move(bt2, 25, 125);
    evas_object_resize(bt2, 250, 50);
 
@@ -428,7 +428,7 @@ test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    bt = elm_button_add(win);
    elm_button_icon_set(bt, ic);
-   elm_button_label_set(bt, "Before Button - Fade Effect");
+   elm_object_text_set(bt, "Before Button - Fade Effect");
    evas_object_move(bt, 25, 125);
    evas_object_resize(bt, 250, 50);
    evas_object_show(bt);
@@ -439,7 +439,7 @@ test_transit6(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    bt2 = elm_button_add(win);
    elm_button_icon_set(bt2, ic);
-   elm_button_label_set(bt2, "After Button - Fade Effect");
+   elm_object_text_set(bt2, "After Button - Fade Effect");
    evas_object_move(bt2, 25, 125);
    evas_object_resize(bt2, 250, 50);
 
@@ -466,13 +466,13 @@ test_transit7(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bg);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Front Button - Resizable Flip Effect");
+   elm_object_text_set(bt, "Front Button - Resizable Flip Effect");
    evas_object_show(bt);
    evas_object_move(bt, 50, 100);
    evas_object_resize(bt, 250, 30);
 
    bt2 = elm_button_add(win);
-   elm_button_label_set(bt2, "Back Button - Resizable Flip Effect");
+   elm_object_text_set(bt2, "Back Button - Resizable Flip Effect");
    evas_object_move(bt2, 50, 100);
    evas_object_resize(bt2, 300, 200);
 
@@ -502,7 +502,7 @@ test_transit8(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bg);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Button - Custom Effect");
+   elm_object_text_set(bt, "Button - Custom Effect");
    evas_object_show(bt);
    evas_object_move(bt, 50, 50);
    evas_object_resize(bt, 150, 150);
@@ -540,25 +540,25 @@ test_transit9(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
    evas_object_show(bg);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Chain 1");
+   elm_object_text_set(bt, "Chain 1");
    evas_object_resize(bt, 100, 100);
    evas_object_move(bt, 0, 0);
    evas_object_show(bt);
 
    bt2 = elm_button_add(win);
-   elm_button_label_set(bt2, "Chain 2");
+   elm_object_text_set(bt2, "Chain 2");
    evas_object_resize(bt2, 100, 100);
    evas_object_move(bt2, 300, 0);
    evas_object_show(bt2);
 
    bt3 = elm_button_add(win);
-   elm_button_label_set(bt3, "Chain 3");
+   elm_object_text_set(bt3, "Chain 3");
    evas_object_resize(bt3, 100, 100);
    evas_object_move(bt3, 300, 300);
    evas_object_show(bt3);
 
    bt4 = elm_button_add(win);
-   elm_button_label_set(bt4, "Chain 4");
+   elm_object_text_set(bt4, "Chain 4");
    evas_object_resize(bt4, 100, 100);
    evas_object_move(bt4, 0, 300);
    evas_object_show(bt4);

diff --git a/src/bin/test_weather.c b/src/bin/test_weather.c
index 6ca1146..609ee61 100644 (file)
--- a/src/bin/test_weather.c
+++ b/src/bin/test_weather.c
@@ -112,13 +112,13 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    evas_object_show(bx0);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "First city");
+   elm_object_text_set(bt, "First city");
    evas_object_show(bt);
    elm_box_pack_end(bx0, bt);
    evas_object_smart_callback_add(bt, "clicked", _first_city_cb, NULL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Second city");
+   elm_object_text_set(bt, "Second city");
    evas_object_show(bt);
    elm_box_pack_end(bx0, bt);
    evas_object_smart_callback_add(bt, "clicked", _second_city_cb, NULL);
@@ -154,7 +154,7 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
    evas_object_show(en);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Apply");
+   elm_object_text_set(bt, "Apply");
    evas_object_show(bt);
    elm_box_pack_end(bx0, bt);
    evas_object_smart_callback_add(bt, "clicked", _apply_cb, NULL);

diff --git a/src/bin/test_win_state.c b/src/bin/test_win_state.c
index 3080553..eaf110e 100644 (file)
--- a/src/bin/test_win_state.c
+++ b/src/bin/test_win_state.c
@@ -141,7 +141,7 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Alpha On");
+   elm_object_text_set(bt, "Alpha On");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_alpha_on, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -149,7 +149,7 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Alpha Off");
+   elm_object_text_set(bt, "Alpha Off");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_alpha_off, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -196,7 +196,7 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Rot 0");
+   elm_object_text_set(bt, "Rot 0");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_rot_0, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -204,7 +204,7 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Rot 90");
+   elm_object_text_set(bt, "Rot 90");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_rot_90, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -212,7 +212,7 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Rot 180");
+   elm_object_text_set(bt, "Rot 180");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_rot_180, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -220,7 +220,7 @@ test_win_state(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Rot 270");
+   elm_object_text_set(bt, "Rot 270");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_rot_270, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -266,7 +266,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
    evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Alpha On");
+   elm_object_text_set(bt, "Alpha On");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_alpha_on, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
@@ -274,7 +274,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Alpha Off");
+   elm_object_text_set(bt, "Alpha Off");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_alpha_off, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, 0.0, 0.0);
@@ -282,7 +282,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Close");
+   elm_object_text_set(bt, "Close");
    evas_object_smart_callback_add(bt, "clicked", _close_win, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -329,7 +329,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
    evas_object_size_hint_fill_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Rot 0");
+   elm_object_text_set(bt, "Rot 0");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_rot_0, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -337,7 +337,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Rot 90");
+   elm_object_text_set(bt, "Rot 90");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_rot_90, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -345,7 +345,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Rot 180");
+   elm_object_text_set(bt, "Rot 180");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_rot_180, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
@@ -353,7 +353,7 @@ test_win_state2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_
    evas_object_show(bt);
 
    bt = elm_button_add(win);
-   elm_button_label_set(bt, "Rot 270");
+   elm_object_text_set(bt, "Rot 270");
    evas_object_smart_callback_add(bt, "clicked", my_bt_38_rot_270, win);
    evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
    evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);