tizen 2.3.1 release

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

diff --git a/src/bin/test_tooltip.c b/src/bin/test_tooltip.c
index d82516c..636423f 100644 (file)
--- a/src/bin/test_tooltip.c
+++ b/src/bin/test_tooltip.c
@@ -6,7 +6,7 @@
 
 typedef struct _Testitem
 {
-   Elm_Object_Item *item;
+   Elm_Object_Item  *item;
    const char       *path;
    int               mode;
    int               onoff;
@@ -116,8 +116,8 @@ _tt_item_icon(void *data   __UNUSED__,
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_resize(ic, 64, 64);
    return ic;
 }
@@ -131,8 +131,8 @@ _tt_item_icon2(void *data   __UNUSED__,
    Evas_Object *ic = elm_icon_add(tt);
    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_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    return ic;
 }
 
@@ -147,9 +147,9 @@ _tt_item_icon3(void *data   __UNUSED__,
 
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "%s/images/insanely_huge_test_image.jpg", elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_size_get(ic, &w, &h);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_object_size_get(ic, &w, &h);
+   elm_image_resizable_set(ic, 0, 0);
    elm_win_screen_size_get(tt, NULL, NULL, &sw, &sh);
    if ((w > sw) || (h > sh))
      {
@@ -248,8 +248,8 @@ _tt_icon(void *data   __UNUSED__,
    char buf[PATH_MAX];
    snprintf(buf, sizeof(buf), "%s/images/logo_small.png",
             elm_app_data_dir_get());
-   elm_icon_file_set(ic, buf, NULL);
-   elm_icon_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_resize(ic, 64, 64);
    return ic;
 }
@@ -262,8 +262,8 @@ _tt_icon2(void *data   __UNUSED__,
    Evas_Object *ic = elm_icon_add(tt);
    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_resizable_set(ic, 0, 0);
+   elm_image_file_set(ic, buf, NULL);
+   elm_image_resizable_set(ic, 0, 0);
    evas_object_resize(ic, 64, 64);
    return ic;
 }
@@ -471,7 +471,7 @@ test_tooltip(void *data       __UNUSED__,
    elm_entry_scrollable_set(se, EINA_TRUE);
    evas_object_size_hint_weight_set(se, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(se, EVAS_HINT_FILL, 0.5);
-   elm_entry_scrollbar_policy_set(se, ELM_SCROLLER_POLICY_OFF,
+   elm_scroller_policy_set(se, ELM_SCROLLER_POLICY_OFF,
                                            ELM_SCROLLER_POLICY_OFF);
    elm_object_text_set(se, "Hello, some entry here!");
    elm_object_tooltip_text_set(se, "Type something here!");