Elm hoversel: 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@60861 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c
index 40b68e2..2ed3f50 100644 (file)
--- a/src/bin/test_hoversel.c
+++ b/src/bin/test_hoversel.c
@@ -25,7 +25,7 @@ test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    bt = elm_hoversel_add(win);
    elm_hoversel_hover_parent_set(bt, win);
-   elm_hoversel_label_set(bt, "Labels");
+   elm_object_text_set(bt, "Labels");
    elm_hoversel_item_add(bt, "Item 1", NULL, ELM_ICON_NONE, NULL, NULL);
    elm_hoversel_item_add(bt, "Item 2", NULL, ELM_ICON_NONE, NULL, NULL);
    elm_hoversel_item_add(bt, "Item 3", NULL, ELM_ICON_NONE, NULL, NULL);
@@ -37,7 +37,7 @@ test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    bt = elm_hoversel_add(win);
    elm_hoversel_hover_parent_set(bt, win);
-   elm_hoversel_label_set(bt, "Some Icons");
+   elm_object_text_set(bt, "Some Icons");
    elm_hoversel_item_add(bt, "Item 1", NULL, ELM_ICON_NONE, NULL, NULL);
    elm_hoversel_item_add(bt, "Item 2", NULL, ELM_ICON_NONE, NULL, NULL);
    elm_hoversel_item_add(bt, "Item 3", "home", ELM_ICON_STANDARD, NULL, NULL);
@@ -49,7 +49,7 @@ test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    bt = elm_hoversel_add(win);
    elm_hoversel_hover_parent_set(bt, win);
-   elm_hoversel_label_set(bt, "All Icons");
+   elm_object_text_set(bt, "All Icons");
    elm_hoversel_item_add(bt, "Item 1", "apps", ELM_ICON_STANDARD, NULL, NULL);
    elm_hoversel_item_add(bt, "Item 2", "arrow_down", ELM_ICON_STANDARD, NULL, NULL);
    elm_hoversel_item_add(bt, "Item 3", "home", ELM_ICON_STANDARD, NULL, NULL);
@@ -61,7 +61,7 @@ test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    bt = elm_hoversel_add(win);
    elm_hoversel_hover_parent_set(bt, win);
-   elm_hoversel_label_set(bt, "All Icons");
+   elm_object_text_set(bt, "All Icons");
    elm_hoversel_item_add(bt, "Item 1", "apps", ELM_ICON_STANDARD, NULL, NULL);
    snprintf(buf, sizeof(buf), "%s/images/sky_02.jpg", PACKAGE_DATA_DIR);
    elm_hoversel_item_add(bt, "Item 2", buf, ELM_ICON_FILE, NULL, NULL);
@@ -74,7 +74,7 @@ test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    bt = elm_hoversel_add(win);
    elm_hoversel_hover_parent_set(bt, win);
-   elm_hoversel_label_set(bt, "Disabled Hoversel");
+   elm_object_text_set(bt, "Disabled Hoversel");
    elm_hoversel_item_add(bt, "Item 1", "apps", ELM_ICON_STANDARD, NULL, NULL);
    elm_hoversel_item_add(bt, "Item 2", "close", ELM_ICON_STANDARD, NULL, NULL);
    elm_object_disabled_set(bt, 1);
@@ -85,7 +85,7 @@ test_hoversel(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    bt = elm_hoversel_add(win);
    elm_hoversel_hover_parent_set(bt, win);
-   elm_hoversel_label_set(bt, "Icon + Label");
+   elm_object_text_set(bt, "Icon + Label");
 
    ic = elm_icon_add(win);
    snprintf(buf, sizeof(buf), "%s/images/sky_03.jpg", PACKAGE_DATA_DIR);

diff --git a/src/bin/test_slideshow.c b/src/bin/test_slideshow.c
index 141bc56..0e31466 100644 (file)
--- a/src/bin/test_slideshow.c
+++ b/src/bin/test_slideshow.c
@@ -50,14 +50,14 @@ static void
 _hv_select(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    elm_slideshow_transition_set(slideshow, data);
-   elm_hoversel_label_set(obj, data);
+   elm_object_text_set(obj, data);
 }
 
 static void
 _layout_select(void *data, Evas_Object *obj, void *event_info __UNUSED__)
 {
    elm_slideshow_layout_set(slideshow, data);
-   elm_hoversel_label_set(obj, data);
+   elm_object_text_set(obj, data);
 }
 
 static void
@@ -168,7 +168,7 @@ test_slideshow(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    elm_hoversel_hover_parent_set(hv, win);
    EINA_LIST_FOREACH(elm_slideshow_transitions_get(slideshow), l, transition)
       elm_hoversel_item_add(hv, transition, NULL, 0, _hv_select, transition);
-   elm_hoversel_label_set(hv, eina_list_data_get(elm_slideshow_transitions_get(slideshow)));
+   elm_object_text_set(hv, eina_list_data_get(elm_slideshow_transitions_get(slideshow)));
    evas_object_show(hv);
 
    hv = elm_hoversel_add(win);
@@ -176,7 +176,7 @@ test_slideshow(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_i
    elm_hoversel_hover_parent_set(hv, win);
    EINA_LIST_FOREACH(elm_slideshow_layouts_get(slideshow), l, layout)
        elm_hoversel_item_add(hv, layout,  NULL, 0, _layout_select, layout);
-   elm_hoversel_label_set(hv, elm_slideshow_layout_get(slideshow));
+   elm_object_text_set(hv, elm_slideshow_layout_get(slideshow));
    evas_object_show(hv);
 
    spin = elm_spinner_add(win);

diff --git a/src/bin/test_weather.c b/src/bin/test_weather.c
index 609ee61..e1cadd3 100644 (file)
--- a/src/bin/test_weather.c
+++ b/src/bin/test_weather.c
@@ -133,7 +133,7 @@ test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_inf
 
    hv = elm_hoversel_add(win);
    elm_hoversel_hover_parent_set(hv, win);
-   elm_hoversel_label_set(hv, "data source");
+   elm_object_text_set(hv, "data source");
    evas_object_size_hint_weight_set(hv, 0.0, 0.0);
    evas_object_size_hint_align_set(hv, 0.5, 0.5);
    elm_box_pack_end(bx0, hv);

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 75b22f6..4ec3ca6 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -1090,7 +1090,7 @@ _menu_press(Evas_Object *obj)
           elm_hoversel_horizontal_set(wd->hoversel, EINA_TRUE);
         elm_object_style_set(wd->hoversel, "entry");
         elm_widget_sub_object_add(obj, wd->hoversel);
-        elm_hoversel_label_set(wd->hoversel, "Text");
+        elm_object_text_set(wd->hoversel, "Text");
         top = elm_widget_top_get(obj);
         if (top) elm_hoversel_hover_parent_set(wd->hoversel, top);
         evas_object_smart_callback_add(wd->hoversel, "dismissed", _dismissed, obj);