elementary: fix ELM_CALENDAR_SELECT_MODE_ONDEMAND

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

diff --git a/src/bin/test_scaling.c b/src/bin/test_scaling.c
index 48075e9..9e5f26e 100644 (file)
--- a/src/bin/test_scaling.c
+++ b/src/bin/test_scaling.c
@@ -1,21 +1,15 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 void
 test_scaling(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *bx, *bt;
+   Evas_Object *win, *bx, *bt;
 
-   win = elm_win_add(NULL, "scaling", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Scaling");
-   elm_win_autodel_set(win, 1);
-
-   bg = elm_bg_add(win);
-   elm_win_resize_object_add(win, bg);
-   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_show(bg);
+   win = elm_win_util_standard_add("scaling", "Scaling");
+   elm_win_autodel_set(win, EINA_TRUE);
 
    bx = elm_box_add(win);
    evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -69,7 +63,7 @@ test_scaling2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    win = elm_win_add(NULL, "scaling2", ELM_WIN_BASIC);
    elm_win_title_set(win, "Scaling 2");
-   elm_win_autodel_set(win, 1);
+   elm_win_autodel_set(win, EINA_TRUE);
 
    bg = elm_bg_add(win);
    elm_win_resize_object_add(win, bg);
@@ -83,38 +77,38 @@ test_scaling2(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
 
    fr = elm_frame_add(win);
    elm_object_scale_set(fr, 0.5);
-   elm_frame_label_set(fr, "Scale: 0.5");
+   elm_object_text_set(fr, "Scale: 0.5");
    lb = elm_label_add(win);
    elm_object_text_set(lb,
-                      "Parent frame scale<br>"
-                      "is 0.5. Child should<br>"
+                      "Parent frame scale<br/>"
+                      "is 0.5. Child should<br/>"
                       "inherit it.");
-   elm_frame_content_set(fr, lb);
+   elm_object_content_set(fr, lb);
    evas_object_show(lb);
    elm_box_pack_end(bx, fr);
    evas_object_show(fr);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Scale: 1.0");
+   elm_object_text_set(fr, "Scale: 1.0");
    lb = elm_label_add(win);
    elm_object_text_set(lb,
-                      "Parent frame scale<br>"
-                      "is 1.0. Child should<br>"
+                      "Parent frame scale<br/>"
+                      "is 1.0. Child should<br/>"
                       "inherit it.");
-   elm_frame_content_set(fr, lb);
+   elm_object_content_set(fr, lb);
    evas_object_show(lb);
    elm_object_scale_set(fr, 1.0);
    elm_box_pack_end(bx, fr);
    evas_object_show(fr);
 
    fr = elm_frame_add(win);
-   elm_frame_label_set(fr, "Scale: 2.0");
+   elm_object_text_set(fr, "Scale: 2.0");
    lb = elm_label_add(win);
    elm_object_text_set(lb,
-                      "Parent frame scale<br>"
-                      "is 2.0. Child should<br>"
+                      "Parent frame scale<br/>"
+                      "is 2.0. Child should<br/>"
                       "inherit it.");
-   elm_frame_content_set(fr, lb);
+   elm_object_content_set(fr, lb);
    evas_object_show(lb);
    elm_object_scale_set(fr, 2.0);
    elm_box_pack_end(bx, fr);