summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunsuChoi <jsuya.choi@samsung.com>2019-12-12 07:29:19 +0000
committerCedric BAIL <cedric.bail@free.fr>2019-12-12 10:20:29 -0800
commit55d987b4189b907db646f85c8cbde6a0bf62776b (patch)
tree6834582c4956ff3be7ce2be6b398e1e292d1875c
parente617ff441aa9cc9286846f3a49eca5ae26e85d0a (diff)
elementary_test: Fix efl_add_ref to efl_add for window autodel
Fix this error message ERR<15404>:eo ../src/lib/eo/eo_base_class.c:710 efl_del() Calling efl_del on object Efl.Ui.Win@0x400000a4b774[2]:hidden:children=0:'(null)':'(null)' with no parent is not advised any more. Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D10863
-rw-r--r--src/bin/elementary/test_bg.c4
-rw-r--r--src/bin/elementary/test_calendar.c2
-rw-r--r--src/bin/elementary/test_efl_gfx_mapping.c2
-rw-r--r--src/bin/elementary/test_efl_gfx_vg_value_provider.c4
-rw-r--r--src/bin/elementary/test_efl_ui_animation_view.c4
-rw-r--r--src/bin/elementary/test_efl_ui_text.c2
-rw-r--r--src/bin/elementary/test_evas_map.c2
-rw-r--r--src/bin/elementary/test_evas_mask.c2
-rw-r--r--src/bin/elementary/test_evas_snapshot.c2
-rw-r--r--src/bin/elementary/test_gfx_filters.c2
-rw-r--r--src/bin/elementary/test_part_bg.c2
-rw-r--r--src/bin/elementary/test_part_shadow.c2
-rw-r--r--src/bin/elementary/test_photocam.c2
-rw-r--r--src/bin/elementary/test_ui_box_stack.c2
-rw-r--r--src/bin/elementary/test_ui_button.c2
-rw-r--r--src/bin/elementary/test_ui_clock.c2
-rw-r--r--src/bin/elementary/test_ui_frame.c2
-rw-r--r--src/bin/elementary/test_ui_panel.c4
-rw-r--r--src/bin/elementary/test_ui_panes.c2
-rw-r--r--src/bin/elementary/test_ui_popup.c16
-rw-r--r--src/bin/elementary/test_ui_progressbar.c2
-rw-r--r--src/bin/elementary/test_ui_scroller.c6
-rw-r--r--src/bin/elementary/test_ui_slider.c2
-rw-r--r--src/bin/elementary/test_ui_slider_interval.c2
-rw-r--r--src/bin/elementary/test_ui_spin.c2
-rw-r--r--src/bin/elementary/test_ui_spin_button.c2
-rw-r--r--src/bin/elementary/test_ui_table_static.c2
-rw-r--r--src/bin/elementary/test_win_dialog.c2
-rw-r--r--src/bin/elementary/test_win_indicator.c2
-rw-r--r--src/bin/elementary/test_win_stack.c12
30 files changed, 48 insertions, 48 deletions
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index 29fdeec..c4a0b0b 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -332,7 +332,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
332 Evas_Object *win, *box, *cs; 332 Evas_Object *win, *box, *cs;
333 char buf[PATH_MAX]; 333 char buf[PATH_MAX];
334 334
335 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 335 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
336 efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Win)"), 336 efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Win)"),
337 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 337 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
338 efl_ui_win_alpha_set(efl_added, 1)); 338 efl_ui_win_alpha_set(efl_added, 1));
@@ -408,7 +408,7 @@ test_bg_scale_type(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
408 Evas_Object *rd, *c; 408 Evas_Object *rd, *c;
409 char buf[PATH_MAX]; 409 char buf[PATH_MAX];
410 410
411 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 411 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
412 efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Bg)"), 412 efl_text_set(efl_added, "Bg EOAPI (Efl.Ui.Bg)"),
413 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 413 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
414 efl_ui_win_alpha_set(efl_added, EINA_FALSE)); 414 efl_ui_win_alpha_set(efl_added, EINA_FALSE));
diff --git a/src/bin/elementary/test_calendar.c b/src/bin/elementary/test_calendar.c
index b3f54f5..8c5fc85d 100644
--- a/src/bin/elementary/test_calendar.c
+++ b/src/bin/elementary/test_calendar.c
@@ -433,7 +433,7 @@ test_efl_ui_calendar(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
433 current_date = time(NULL) + SEC_PER_YEAR; 433 current_date = time(NULL) + SEC_PER_YEAR;
434 localtime_r(&current_date, &max_date); 434 localtime_r(&current_date, &max_date);
435 435
436 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 436 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
437 efl_text_set(efl_added, "Efl Ui Calendar"), 437 efl_text_set(efl_added, "Efl Ui Calendar"),
438 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 438 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
439 439
diff --git a/src/bin/elementary/test_efl_gfx_mapping.c b/src/bin/elementary/test_efl_gfx_mapping.c
index fecfc45..a895d82 100644
--- a/src/bin/elementary/test_efl_gfx_mapping.c
+++ b/src/bin/elementary/test_efl_gfx_mapping.c
@@ -46,7 +46,7 @@ test_efl_gfx_mapping(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
46 Evas_Object *win, *img; 46 Evas_Object *win, *img;
47 char buf[PATH_MAX]; 47 char buf[PATH_MAX];
48 48
49 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 49 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
50 efl_text_set(efl_added, "Efl Gfx Map"), 50 efl_text_set(efl_added, "Efl Gfx Map"),
51 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 51 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
52 52
diff --git a/src/bin/elementary/test_efl_gfx_vg_value_provider.c b/src/bin/elementary/test_efl_gfx_vg_value_provider.c
index 9a800e7..9982652 100644
--- a/src/bin/elementary/test_efl_gfx_vg_value_provider.c
+++ b/src/bin/elementary/test_efl_gfx_vg_value_provider.c
@@ -299,7 +299,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
299 // This line must to need. 299 // This line must to need.
300 setenv("ELM_ACCEL", "gl", 1); 300 setenv("ELM_ACCEL", "gl", 1);
301 301
302 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 302 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
303 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), 303 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
304 efl_text_set(efl_added, "Efl_Ui_Animation_View demo"), 304 efl_text_set(efl_added, "Efl_Ui_Animation_View demo"),
305 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 305 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
@@ -573,7 +573,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
573 Eo *win, *box; 573 Eo *win, *box;
574 char buf[255]; 574 char buf[255];
575 575
576 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 576 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
577 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC), 577 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_BASIC),
578 efl_text_set(efl_added, "Efl_Ui_Animation_View demo"), 578 efl_text_set(efl_added, "Efl_Ui_Animation_View demo"),
579 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 579 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
diff --git a/src/bin/elementary/test_efl_ui_animation_view.c b/src/bin/elementary/test_efl_ui_animation_view.c
index 9dc2352..b086a1b 100644
--- a/src/bin/elementary/test_efl_ui_animation_view.c
+++ b/src/bin/elementary/test_efl_ui_animation_view.c
@@ -141,7 +141,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
141 Eo *win, *box, *box2, *box3, *box4, *label, *anim_view, *check, *slider; 141 Eo *win, *box, *box2, *box3, *box4, *label, *anim_view, *check, *slider;
142 char buf[255]; 142 char buf[255];
143 143
144 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 144 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
145 efl_text_set(efl_added, "Efl_Ui_Animation_View demo"), 145 efl_text_set(efl_added, "Efl_Ui_Animation_View demo"),
146 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 146 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
147 147
@@ -295,7 +295,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
295 Eo *win, *box; 295 Eo *win, *box;
296 char buf[255]; 296 char buf[255];
297 297
298 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 298 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
299 efl_text_set(efl_added, "Efl_Ui_Animation_View demo"), 299 efl_text_set(efl_added, "Efl_Ui_Animation_View demo"),
300 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 300 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
301 301
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index 40b88bf..f14d25d 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -42,7 +42,7 @@ test_efl_ui_text_label(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, voi
42 Eo *en; 42 Eo *en;
43 char *markup; 43 char *markup;
44 44
45 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 45 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
46 efl_text_set(efl_added, "Efl Canvas_Layout"), 46 efl_text_set(efl_added, "Efl Canvas_Layout"),
47 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 47 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
48 48
diff --git a/src/bin/elementary/test_evas_map.c b/src/bin/elementary/test_evas_map.c
index 0687a33..78800ab 100644
--- a/src/bin/elementary/test_evas_map.c
+++ b/src/bin/elementary/test_evas_map.c
@@ -54,7 +54,7 @@ test_evas_map(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
54 Evas_Object *win, *img; 54 Evas_Object *win, *img;
55 char buf[PATH_MAX]; 55 char buf[PATH_MAX];
56 56
57 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 57 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
58 efl_text_set(efl_added, "Evas Map"), 58 efl_text_set(efl_added, "Evas Map"),
59 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 59 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
60 60
diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c
index 4a263e0..f1620af 100644
--- a/src/bin/elementary/test_evas_mask.c
+++ b/src/bin/elementary/test_evas_mask.c
@@ -122,7 +122,7 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
122 Elm_Genlist_Item_Class *itc; 122 Elm_Genlist_Item_Class *itc;
123 char buf[PATH_MAX]; 123 char buf[PATH_MAX];
124 124
125 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 125 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
126 efl_text_set(efl_added, "Evas masking demo"), 126 efl_text_set(efl_added, "Evas masking demo"),
127 efl_ui_win_autodel_set(efl_added, 1)); 127 efl_ui_win_autodel_set(efl_added, 1));
128 128
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index 40513bb..b6ac7bc 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -124,7 +124,7 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
124 Eo *win, *table, *o, *snap, *box; 124 Eo *win, *table, *o, *snap, *box;
125 const char *path; 125 const char *path;
126 126
127 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 127 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
128 efl_text_set(efl_added, "Evas Snapshot"), 128 efl_text_set(efl_added, "Evas Snapshot"),
129 efl_ui_win_autodel_set(efl_added, 1)); 129 efl_ui_win_autodel_set(efl_added, 1));
130 130
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index a890aba..8fb84ab 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -332,7 +332,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
332{ 332{
333 Eo *win, *box, *box2, *o, *text = NULL, *spinner, *code, *split, *flip, *tb; 333 Eo *win, *box, *box2, *o, *text = NULL, *spinner, *code, *split, *flip, *tb;
334 334
335 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 335 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
336 efl_text_set(efl_added, "Gfx Filter Editor"), 336 efl_text_set(efl_added, "Gfx Filter Editor"),
337 efl_ui_win_autodel_set(efl_added, 1)); 337 efl_ui_win_autodel_set(efl_added, 1));
338 338
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index 04aa723..1ee74d7 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -146,7 +146,7 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
146 content_class[15] = EFL_UI_SPIN_CLASS; 146 content_class[15] = EFL_UI_SPIN_CLASS;
147 content_class[16] = EFL_UI_SPIN_BUTTON_CLASS; 147 content_class[16] = EFL_UI_SPIN_BUTTON_CLASS;
148 148
149 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 149 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
150 efl_text_set(efl_added, "Widget Part Background"), 150 efl_text_set(efl_added, "Widget Part Background"),
151 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 151 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
152 152
diff --git a/src/bin/elementary/test_part_shadow.c b/src/bin/elementary/test_part_shadow.c
index 8378473..c8e0f18 100644
--- a/src/bin/elementary/test_part_shadow.c
+++ b/src/bin/elementary/test_part_shadow.c
@@ -86,7 +86,7 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
86 86
87 td = calloc(1, sizeof(*td)); 87 td = calloc(1, sizeof(*td));
88 88
89 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 89 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
90 efl_ui_win_name_set(efl_added, "shadow"), 90 efl_ui_win_name_set(efl_added, "shadow"),
91 efl_text_set(efl_added, "Shadow effects")); 91 efl_text_set(efl_added, "Shadow effects"));
92 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _delete_cb, td); 92 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _delete_cb, td);
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index 5f3e30b..6de8bde 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -805,7 +805,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
805 Eo *win, *bx, *zoomable, *rect; 805 Eo *win, *bx, *zoomable, *rect;
806 char buf[PATH_MAX]; 806 char buf[PATH_MAX];
807 807
808 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 808 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
809 efl_text_set(efl_added, "Efl.Ui.Image_Zoomable animation"), 809 efl_text_set(efl_added, "Efl.Ui.Image_Zoomable animation"),
810 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 810 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
811 811
diff --git a/src/bin/elementary/test_ui_box_stack.c b/src/bin/elementary/test_ui_box_stack.c
index 0e876b3..c272805 100644
--- a/src/bin/elementary/test_ui_box_stack.c
+++ b/src/bin/elementary/test_ui_box_stack.c
@@ -12,7 +12,7 @@ test_ui_box_stack(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
12 Evas_Object *win, *bx, *o; 12 Evas_Object *win, *bx, *o;
13 char buf[PATH_MAX]; 13 char buf[PATH_MAX];
14 14
15 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 15 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
16 efl_text_set(efl_added, "Efl.Ui.Box_Stack"), 16 efl_text_set(efl_added, "Efl.Ui.Box_Stack"),
17 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 17 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
18 18
diff --git a/src/bin/elementary/test_ui_button.c b/src/bin/elementary/test_ui_button.c
index 0cd1e93..eaafb8a 100644
--- a/src/bin/elementary/test_ui_button.c
+++ b/src/bin/elementary/test_ui_button.c
@@ -29,7 +29,7 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
29 Eo *win, *bx, *btn; 29 Eo *win, *bx, *btn;
30 char buf[PATH_MAX]; 30 char buf[PATH_MAX];
31 31
32 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 32 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
33 efl_text_set(efl_added, "Efl.Ui.Button"), 33 efl_text_set(efl_added, "Efl.Ui.Button"),
34 efl_ui_win_autodel_set(efl_added, EINA_TRUE) 34 efl_ui_win_autodel_set(efl_added, EINA_TRUE)
35 ); 35 );
diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c
index 2ded458..c2840a6 100644
--- a/src/bin/elementary/test_ui_clock.c
+++ b/src/bin/elementary/test_ui_clock.c
@@ -48,7 +48,7 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
48{ 48{
49 Evas_Object *win, *bx; 49 Evas_Object *win, *bx;
50 50
51 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 51 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
52 efl_text_set(efl_added, "Efl.Ui.Clock"), 52 efl_text_set(efl_added, "Efl.Ui.Clock"),
53 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 53 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
54 54
diff --git a/src/bin/elementary/test_ui_frame.c b/src/bin/elementary/test_ui_frame.c
index d5d496d..2c152c9 100644
--- a/src/bin/elementary/test_ui_frame.c
+++ b/src/bin/elementary/test_ui_frame.c
@@ -15,7 +15,7 @@ test_ui_frame(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
15{ 15{
16 Eo *win, *bx, *f, *txt; 16 Eo *win, *bx, *f, *txt;
17 17
18 win = efl_add_ref(EFL_UI_WIN_CLASS, efl_main_loop_get(), 18 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
19 efl_text_set(efl_added, "Efl.Ui.Frame"), 19 efl_text_set(efl_added, "Efl.Ui.Frame"),
20 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 20 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
21 21
diff --git a/src/bin/elementary/test_ui_panel.c b/src/bin/elementary/test_ui_panel.c
index d5045c6..7a280a3 100644
--- a/src/bin/elementary/test_ui_panel.c
+++ b/src/bin/elementary/test_ui_panel.c
@@ -10,7 +10,7 @@ test_ui_panel(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
10 char buf[PATH_MAX] = {0}; 10 char buf[PATH_MAX] = {0};
11 Eo *win, *table, *panel; 11 Eo *win, *table, *panel;
12 12
13 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 13 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
14 efl_text_set(efl_added, "Efl.Ui.Panel"), 14 efl_text_set(efl_added, "Efl.Ui.Panel"),
15 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 15 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
16 16
@@ -102,7 +102,7 @@ test_ui_panel2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
102 int i; 102 int i;
103 Eo *win, *box, *check, *btn, *table, *list, *panel; 103 Eo *win, *box, *check, *btn, *table, *list, *panel;
104 104
105 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 105 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
106 efl_text_set(efl_added, "Efl.Ui.Panel"), 106 efl_text_set(efl_added, "Efl.Ui.Panel"),
107 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 107 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
108 108
diff --git a/src/bin/elementary/test_ui_panes.c b/src/bin/elementary/test_ui_panes.c
index 72d2ab9..bbdf004 100644
--- a/src/bin/elementary/test_ui_panes.c
+++ b/src/bin/elementary/test_ui_panes.c
@@ -9,7 +9,7 @@ test_panes_minsize(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
9{ 9{
10 Eo *win, *panes, *panes_h; 10 Eo *win, *panes, *panes_h;
11 11
12 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 12 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
13 efl_text_set(efl_added, "Efl.Ui.Panes"), 13 efl_text_set(efl_added, "Efl.Ui.Panes"),
14 efl_ui_win_autodel_set(efl_added, EINA_TRUE) 14 efl_ui_win_autodel_set(efl_added, EINA_TRUE)
15 ); 15 );
diff --git a/src/bin/elementary/test_ui_popup.c b/src/bin/elementary/test_ui_popup.c
index 11b7d60..2388c2e 100644
--- a/src/bin/elementary/test_ui_popup.c
+++ b/src/bin/elementary/test_ui_popup.c
@@ -219,7 +219,7 @@ _win_del(void *data, const Efl_Event *ev EINA_UNUSED)
219 /* only free pointer if the other window has already been freed */ 219 /* only free pointer if the other window has already been freed */
220 if (!p_data->win) 220 if (!p_data->win)
221 free(p_data); 221 free(p_data);
222 efl_unref(win); 222 efl_del(win);
223 printf("window is deleted\n"); 223 printf("window is deleted\n");
224} 224}
225 225
@@ -232,7 +232,7 @@ _panel_win_del(void *data, const Efl_Event *ev EINA_UNUSED)
232 /* only free pointer if the other window has already been freed */ 232 /* only free pointer if the other window has already been freed */
233 if (!p_data->win) 233 if (!p_data->win)
234 free(p_data); 234 free(p_data);
235 efl_unref(win); 235 efl_del(win);
236 printf("window is deleted\n"); 236 printf("window is deleted\n");
237} 237}
238 238
@@ -241,14 +241,14 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
241{ 241{
242 efl_ui_popup_data *p_data = (efl_ui_popup_data*)calloc(1, sizeof(efl_ui_popup_data)); 242 efl_ui_popup_data *p_data = (efl_ui_popup_data*)calloc(1, sizeof(efl_ui_popup_data));
243 243
244 Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 244 Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
245 efl_text_set(efl_added, "Efl.Ui.Popup"), 245 efl_text_set(efl_added, "Efl.Ui.Popup"),
246 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 246 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
247 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data); 247 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data);
248 248
249 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500)); 249 efl_gfx_entity_size_set(win, EINA_SIZE2D(500, 500));
250 250
251 Eo *panel_win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 251 Eo *panel_win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
252 efl_text_set(efl_added, "Efl.Ui.Popup Panel"), 252 efl_text_set(efl_added, "Efl.Ui.Popup Panel"),
253 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 253 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
254 efl_event_callback_add(panel_win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _panel_win_del, p_data); 254 efl_event_callback_add(panel_win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _panel_win_del, p_data);
@@ -360,7 +360,7 @@ test_ui_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
360{ 360{
361 char buf[PATH_MAX]; 361 char buf[PATH_MAX];
362 362
363 Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 363 Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
364 efl_text_set(efl_added, "Efl.Ui.Popup.Alert"), 364 efl_text_set(efl_added, "Efl.Ui.Popup.Alert"),
365 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 365 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
366 366
@@ -515,7 +515,7 @@ _alert_scroll_case5_cb(void *data, const Efl_Event *ev EINA_UNUSED)
515void 515void
516test_ui_scroll_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 516test_ui_scroll_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
517{ 517{
518 Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 518 Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
519 efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Scroll"), 519 efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Scroll"),
520 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 520 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
521 521
@@ -898,7 +898,7 @@ _alert_text_case14_cb(void *data, const Efl_Event *ev EINA_UNUSED)
898void 898void
899test_ui_text_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 899test_ui_text_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
900{ 900{
901 Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 901 Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
902 efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Text"), 902 efl_text_set(efl_added, "Efl.Ui.Popup.Alert.Text"),
903 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 903 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
904 904
@@ -1008,7 +1008,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
1008 1008
1009 char buf[PATH_MAX]; 1009 char buf[PATH_MAX];
1010 1010
1011 Eo *win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 1011 Eo *win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
1012 efl_text_set(efl_added, "Efl.Ui.Popup.Anchor"), 1012 efl_text_set(efl_added, "Efl.Ui.Popup.Anchor"),
1013 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 1013 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
1014 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data); 1014 efl_event_callback_add(win, EFL_UI_WIN_EVENT_DELETE_REQUEST, _win_del, p_data);
diff --git a/src/bin/elementary/test_ui_progressbar.c b/src/bin/elementary/test_ui_progressbar.c
index c0bf12f..a9ca9a8 100644
--- a/src/bin/elementary/test_ui_progressbar.c
+++ b/src/bin/elementary/test_ui_progressbar.c
@@ -151,7 +151,7 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
151 151
152 pd = (pbdata *)calloc(1, sizeof(pbdata)); 152 pd = (pbdata *)calloc(1, sizeof(pbdata));
153 153
154 pd->win = win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 154 pd->win = win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
155 efl_text_set(efl_added, "Efl.Ui.Progressbar"), 155 efl_text_set(efl_added, "Efl.Ui.Progressbar"),
156 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 156 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
157 efl_event_callback_add(efl_added, EFL_UI_WIN_EVENT_DELETE_REQUEST, 157 efl_event_callback_add(efl_added, EFL_UI_WIN_EVENT_DELETE_REQUEST,
diff --git a/src/bin/elementary/test_ui_scroller.c b/src/bin/elementary/test_ui_scroller.c
index e5f2a61..29597b0 100644
--- a/src/bin/elementary/test_ui_scroller.c
+++ b/src/bin/elementary/test_ui_scroller.c
@@ -31,7 +31,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
31 Eo *win, *sc, *sc2, *sc3, *bx, *bx2, *gd, *gd2; 31 Eo *win, *sc, *sc2, *sc3, *bx, *bx2, *gd, *gd2;
32 int i, j; 32 int i, j;
33 33
34 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 34 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
35 efl_text_set(efl_added, "Efl Ui Scroller"), 35 efl_text_set(efl_added, "Efl Ui Scroller"),
36 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 36 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
37 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400)); 37 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
@@ -135,7 +135,7 @@ test_efl_ui_scroller_simple(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
135 Eo *win, *sc, *bx; 135 Eo *win, *sc, *bx;
136 int i; 136 int i;
137 137
138 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 138 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
139 efl_text_set(efl_added, "Efl Ui Scroller Simple"), 139 efl_text_set(efl_added, "Efl Ui Scroller Simple"),
140 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 140 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
141 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400)); 141 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
@@ -170,7 +170,7 @@ test_efl_ui_scroller_simple2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
170 Eo *win, *sc, *tb; 170 Eo *win, *sc, *tb;
171 int i; 171 int i;
172 172
173 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 173 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
174 efl_text_set(efl_added, "Efl Ui Scroller Simple2"), 174 efl_text_set(efl_added, "Efl Ui Scroller Simple2"),
175 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 175 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
176 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400)); 176 efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
diff --git a/src/bin/elementary/test_ui_slider.c b/src/bin/elementary/test_ui_slider.c
index 5b901a2..90932a8 100644
--- a/src/bin/elementary/test_ui_slider.c
+++ b/src/bin/elementary/test_ui_slider.c
@@ -52,7 +52,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
52{ 52{
53 Eo *win, *bx, *hbx; 53 Eo *win, *bx, *hbx;
54 54
55 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 55 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
56 efl_text_set(efl_added, "Efl.Ui.Slider"), 56 efl_text_set(efl_added, "Efl.Ui.Slider"),
57 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 57 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
58 58
diff --git a/src/bin/elementary/test_ui_slider_interval.c b/src/bin/elementary/test_ui_slider_interval.c
index de4d983..09d97be 100644
--- a/src/bin/elementary/test_ui_slider_interval.c
+++ b/src/bin/elementary/test_ui_slider_interval.c
@@ -33,7 +33,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
33 Eo *win, *bx, *hbx; 33 Eo *win, *bx, *hbx;
34 double step; 34 double step;
35 35
36 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 36 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
37 efl_text_set(efl_added, "Efl.Ui.Slider_Interval"), 37 efl_text_set(efl_added, "Efl.Ui.Slider_Interval"),
38 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 38 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
39 39
diff --git a/src/bin/elementary/test_ui_spin.c b/src/bin/elementary/test_ui_spin.c
index 965c88e..ce2208a 100644
--- a/src/bin/elementary/test_ui_spin.c
+++ b/src/bin/elementary/test_ui_spin.c
@@ -39,7 +39,7 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
39{ 39{
40 Eo *win, *bx, *sp; 40 Eo *win, *bx, *sp;
41 41
42 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 42 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
43 efl_text_set(efl_added, "Efl.Ui.Spin"), 43 efl_text_set(efl_added, "Efl.Ui.Spin"),
44 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 44 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
45 45
diff --git a/src/bin/elementary/test_ui_spin_button.c b/src/bin/elementary/test_ui_spin_button.c
index 600611e..4adbfb1 100644
--- a/src/bin/elementary/test_ui_spin_button.c
+++ b/src/bin/elementary/test_ui_spin_button.c
@@ -28,7 +28,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
28 {9, "September"}, {10, "October"}, {11, "November"}, {12, "December"} 28 {9, "September"}, {10, "October"}, {11, "November"}, {12, "December"}
29 }; 29 };
30 30
31 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 31 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
32 efl_text_set(efl_added, "Efl.Ui.Spin_Button"), 32 efl_text_set(efl_added, "Efl.Ui.Spin_Button"),
33 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 33 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
34 34
diff --git a/src/bin/elementary/test_ui_table_static.c b/src/bin/elementary/test_ui_table_static.c
index 7656bbc..8f66aeb 100644
--- a/src/bin/elementary/test_ui_table_static.c
+++ b/src/bin/elementary/test_ui_table_static.c
@@ -103,7 +103,7 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
103 Eo *win, *table, *bt, *rc, *en; 103 Eo *win, *table, *bt, *rc, *en;
104 api_data *api = calloc(1, sizeof(*api)); 104 api_data *api = calloc(1, sizeof(*api));
105 105
106 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 106 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
107 efl_ui_win_name_set(efl_added, "table"), 107 efl_ui_win_name_set(efl_added, "table"),
108 efl_text_set(efl_added, "Table"), 108 efl_text_set(efl_added, "Table"),
109 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 109 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
diff --git a/src/bin/elementary/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c
index e3b4698..f2b0a16 100644
--- a/src/bin/elementary/test_win_dialog.c
+++ b/src/bin/elementary/test_win_dialog.c
@@ -104,7 +104,7 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
104{ 104{
105 Efl_Canvas_Object *dia, *lb; 105 Efl_Canvas_Object *dia, *lb;
106 106
107 dia = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 107 dia = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
108 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_DIALOG_BASIC), 108 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_DIALOG_BASIC),
109 efl_ui_win_name_set(efl_added, "window-dia-4"), 109 efl_ui_win_name_set(efl_added, "window-dia-4"),
110 efl_ui_win_autodel_set(efl_added, EINA_TRUE), 110 efl_ui_win_autodel_set(efl_added, EINA_TRUE),
diff --git a/src/bin/elementary/test_win_indicator.c b/src/bin/elementary/test_win_indicator.c
index 98ba2e2..693c1f9 100644
--- a/src/bin/elementary/test_win_indicator.c
+++ b/src/bin/elementary/test_win_indicator.c
@@ -92,7 +92,7 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
92 indicator = _create_indicator(); 92 indicator = _create_indicator();
93 93
94 // FIXME: Resizing window should no cause sizing issues! 94 // FIXME: Resizing window should no cause sizing issues!
95 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 95 win = efl_add(EFL_UI_WIN_CLASS, efl_main_loop_get(),
96 efl_text_set(efl_added, "Efl.Win.Indicator"), 96 efl_text_set(efl_added, "Efl.Win.Indicator"),
97 efl_gfx_hint_size_max_set(efl_added, EINA_SIZE2D(300, -1)), 97 efl_gfx_hint_size_max_set(efl_added, EINA_SIZE2D(300, -1)),
98 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 98 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
diff --git a/src/bin/elementary/test_win_stack.c b/src/bin/elementary/test_win_stack.c
index c16c07b..72510d0 100644
--- a/src/bin/elementary/test_win_stack.c
+++ b/src/bin/elementary/test_win_stack.c
@@ -14,18 +14,18 @@ static void _bt_popto(void *data, Evas_Object *obj, void *event_info);
14static void _bt_pressed(void *data, Evas_Object *obj, void *event_info); 14static void _bt_pressed(void *data, Evas_Object *obj, void *event_info);
15 15
16static Evas_Object * 16static Evas_Object *
17_win_new(Evas_Object *stack_top, const char *title) 17_win_new(Evas_Object* parent, Evas_Object *stack_top, const char *title)
18{ 18{
19 Evas_Object *bg, *bx, *bt, *lb, *win; 19 Evas_Object *bg, *bx, *bt, *lb, *win;
20 20
21 if (level >= 3) 21 if (level >= 3)
22 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 22 win = efl_add(EFL_UI_WIN_CLASS, parent,
23 efl_ui_win_name_set(efl_added, "window-stack"), 23 efl_ui_win_name_set(efl_added, "window-stack"),
24 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_NAVIFRAME_BASIC), 24 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_NAVIFRAME_BASIC),
25 efl_text_set(efl_added, title), 25 efl_text_set(efl_added, title),
26 efl_ui_win_autodel_set(efl_added, EINA_TRUE)); 26 efl_ui_win_autodel_set(efl_added, EINA_TRUE));
27 else 27 else
28 win = efl_add_ref(EFL_UI_WIN_CLASS, NULL, 28 win = efl_add(EFL_UI_WIN_CLASS, parent,
29 efl_ui_win_name_set(efl_added, "window-stack"), 29 efl_ui_win_name_set(efl_added, "window-stack"),
30 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_DIALOG_BASIC), 30 efl_ui_win_type_set(efl_added, EFL_UI_WIN_TYPE_DIALOG_BASIC),
31 efl_text_set(efl_added, title), 31 efl_text_set(efl_added, title),
@@ -63,7 +63,7 @@ _win_new(Evas_Object *stack_top, const char *title)
63 63
64 bt = elm_button_add(win); 64 bt = elm_button_add(win);
65 elm_object_text_set(bt, "Push"); 65 elm_object_text_set(bt, "Push");
66 evas_object_smart_callback_add(bt, "clicked", _bt_pressed, stack_top); 66 evas_object_smart_callback_add(bt, "clicked", _bt_pressed, parent);
67 evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); 67 evas_object_size_hint_fill_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
68 evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); 68 evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
69 elm_box_pack_end(bx, bt); 69 elm_box_pack_end(bx, bt);
@@ -82,12 +82,12 @@ _bt_popto(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_info
82static void 82static void
83_bt_pressed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED) 83_bt_pressed(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
84{ 84{
85 Evas_Object *win; 85 Evas_Object *win = (Evas_Object*) data;
86 char buf[100]; 86 char buf[100];
87 87
88 level++; 88 level++;
89 snprintf(buf, sizeof(buf), "Level %i", level); 89 snprintf(buf, sizeof(buf), "Level %i", level);
90 win = _win_new(data, buf); 90 win = _win_new(win, obj, buf);
91 efl_ui_win_stack_master_id_set(win, efl_ui_win_stack_id_get(data)); 91 efl_ui_win_stack_master_id_set(win, efl_ui_win_stack_id_get(data));
92} 92}
93 93