[Migration] Conflict Fix: ctxpopup, diskselector, flipselector, spinner, tooltip...

[framework/uifw/elementary.git] / src / bin / test_tooltip.c

diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c
index 5683f3b..fb3ed3d 100644 (file)
--- a/src/bin/test_tooltip.c
+++ b/src/bin/test_tooltip.c
@@ -52,17 +52,17 @@ gltt_exp(void *data       __UNUSED__,
          void            *event_info)
 {
    Elm_Object_Item *glit = event_info;
-   Evas_Object *gl = elm_genlist_item_genlist_get(glit);
-   int val = (int) elm_object_item_data_get(glit);
+   Evas_Object *gl = elm_object_item_widget_get(glit);
+   int val = (int)(long) elm_object_item_data_get(glit);
    Elm_Object_Item *glit1, *glit2, *glit3;
 
    val *= 10;
-   glit1 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 1), glit,
+   glit1 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 1), glit,
                                    ELM_GENLIST_ITEM_NONE, NULL, NULL);
-   glit2 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 2), glit,
+   glit2 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 2), glit,
                                    ELM_GENLIST_ITEM_NONE, NULL, NULL);
-   glit3 = elm_genlist_item_append(gl, &itct, (void *)(long)(val + 3), glit,
-                                   ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+   glit3 = elm_genlist_item_append(gl, &itct, (void *)(long) (val + 3), glit,
+                                   ELM_GENLIST_ITEM_TREE, NULL, NULL);
 
    elm_genlist_item_tooltip_text_set(glit1, "Testing A");
    elm_genlist_item_tooltip_text_set(glit2, "Testing B");
@@ -117,7 +117,7 @@ _tt_item_icon(void *data   __UNUSED__,
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
             elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_resize(ic, 64, 64);
    return ic;
 }
@@ -132,7 +132,7 @@ _tt_item_icon2(void *data   __UNUSED__,
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "%s/images/logo.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    return ic;
 }
 
@@ -248,7 +248,7 @@ _tt_icon(void *data   __UNUSED__,
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
             elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_resize(ic, 64, 64);
    return ic;
 }
@@ -262,7 +262,7 @@ _tt_icon2(void *data   __UNUSED__,
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "%s/images/icon_00.png", elm_app_data_dir_get());
    elm_icon_file_set(ic, buf, NULL);
-   elm_icon_scale_set(ic, 0, 0);
+   elm_icon_resizable_set(ic, 0, 0);
    evas_object_resize(ic, 64, 64);
    return ic;
 }
@@ -481,7 +481,7 @@ test_tooltip(void *data       __UNUSED__,
                                            ELM_SCROLLER_POLICY_OFF);
    elm_object_text_set(se, "Hello, some scrolled entry here!");
    elm_object_tooltip_text_set(se, "Type something here!");
-   elm_entry_single_line_set(se, 1);
+   elm_entry_single_line_set(se, EINA_TRUE);
    elm_box_pack_end(bx, se);
    evas_object_show(se);
 
@@ -592,9 +592,9 @@ test_tooltip2(void *data       __UNUSED__,
    itct.func.text_get = gltt_text_get;
 
    glit1 = elm_genlist_item_append(gl, &itct, (void *)1, NULL,
-                                   ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+                                   ELM_GENLIST_ITEM_TREE, NULL, NULL);
    glit2 = elm_genlist_item_append(gl, &itct, (void *)2, NULL,
-                                   ELM_GENLIST_ITEM_SUBITEMS, NULL, NULL);
+                                   ELM_GENLIST_ITEM_TREE, NULL, NULL);
    glit3 = elm_genlist_item_append(gl, &itct, (void *)3, NULL,
                                    ELM_GENLIST_ITEM_NONE, NULL, NULL);