elm test_entry.c: Fixed formatting.

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

diff --git a/src/bin/test_button.c b/src/bin/test_button.c
index a52c893..be5d655 100644 (file)
--- a/src/bin/test_button.c
+++ b/src/bin/test_button.c
@@ -1,7 +1,7 @@
-#include <Elementary.h>
 #ifdef HAVE_CONFIG_H
 # include "elementary_config.h"
 #endif
+#include <Elementary.h>
 #ifndef ELM_LIB_QUICKLAUNCH
 static void
 _bt_repeated(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
@@ -18,7 +18,7 @@ _bt_repeated(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED_
 static void
 _bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   int param = (int)(data);
+   int param = (int)(long)(data);
 
    printf("clicked event on Button:%d\n", param);
 }
@@ -26,7 +26,7 @@ _bt_clicked(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__
 static void
 _bt_unpressed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   int param = (int)(data);
+   int param = (int)(long)(data);
 
    printf("unpressed event on Button:%d\n", param);
 }
@@ -34,18 +34,12 @@ _bt_unpressed(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
 void
 test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
 {
-   Evas_Object *win, *bg, *scr, *bx, *ic, *bt;
+   Evas_Object *win, *scr, *bx, *ic, *bt;
    char buf[PATH_MAX];
 
-   win = elm_win_add(NULL, "buttons", ELM_WIN_BASIC);
-   elm_win_title_set(win, "Buttons");
+   win = elm_win_util_standard_add("buttons", "Buttons");
    elm_win_autodel_set(win, EINA_TRUE);
 
-   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);
-
    scr = elm_scroller_add(win);
    elm_scroller_bounce_set(scr, EINA_FALSE, EINA_TRUE);
    elm_scroller_policy_set(scr, ELM_SCROLLER_POLICY_OFF, ELM_SCROLLER_POLICY_AUTO);
@@ -74,7 +68,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    ic = elm_icon_add(bx);
    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);
    bt = elm_button_add(win);
    elm_object_text_set(bt, "Icon no scale");
    elm_object_part_content_set(bt, "icon", ic);
@@ -125,7 +119,7 @@ test_button(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
    ic = elm_icon_add(win);
    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);
    bt = elm_button_add(win);
    elm_object_part_content_set(bt, "icon", ic);
    evas_object_smart_callback_add(bt, "clicked", _bt_clicked, (void *)6);