From 04b05b1ab39aa8545391a22a9a072a23b392684c Mon Sep 17 00:00:00 2001 From: seoz Date: Wed, 28 Mar 2012 06:04:36 +0000 Subject: [PATCH] elm examples: Use standard way of elementary applications. EAPI_MAIN, elm_shutdown, ELM_MAIN() git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@69690 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/examples/actionslider_example_01.c | 1 + src/examples/anchorblock_example_01.c | 5 +++-- src/examples/bg_example_01.c | 3 +-- src/examples/bg_example_02.c | 4 ++-- src/examples/bg_example_03.c | 3 ++- src/examples/box_example_02.c | 5 +++-- src/examples/bubble_example_01.c | 3 +-- src/examples/button_example_00.c | 6 +++--- src/examples/button_example_01.c | 5 +++-- src/examples/calendar_example_01.c | 2 ++ src/examples/calendar_example_02.c | 2 ++ src/examples/calendar_example_03.c | 2 ++ src/examples/calendar_example_04.c | 2 ++ src/examples/calendar_example_05.c | 2 ++ src/examples/calendar_example_06.c | 2 ++ src/examples/check_example_01.c | 2 +- src/examples/clock_example.c | 4 +++- src/examples/colorselector_example_01.c | 1 + src/examples/conformant_example_01.c | 2 ++ src/examples/conformant_example_02.c | 2 ++ src/examples/ctxpopup_example_01.c | 1 + src/examples/datetime_example.c | 5 +++-- src/examples/dayselector_example.c | 4 +++- src/examples/diskselector_example_01.c | 2 ++ src/examples/diskselector_example_02.c | 2 ++ src/examples/efl_thread_1.c | 5 +++-- src/examples/efl_thread_2.c | 5 +++-- src/examples/efl_thread_3.c | 5 +++-- src/examples/efl_thread_4.c | 5 +++-- src/examples/efl_thread_5.c | 5 +++-- src/examples/efl_thread_6.c | 5 +++-- src/examples/efl_thread_win32_1.c | 5 +++-- src/examples/efl_thread_win32_2.c | 5 +++-- src/examples/efl_thread_win32_3.c | 5 +++-- src/examples/efl_thread_win32_4.c | 5 +++-- src/examples/entry_example.c | 5 +++-- src/examples/fileselector_button_example.c | 3 ++- src/examples/fileselector_entry_example.c | 3 ++- src/examples/fileselector_example.c | 3 ++- src/examples/flip_example_01.c | 1 + src/examples/flipselector_example.c | 2 ++ src/examples/frame_example_01.c | 6 +----- src/examples/general_funcs_example.c | 3 +-- src/examples/gengrid_example.c | 5 +++-- src/examples/genlist_example_01.c | 4 ++-- src/examples/genlist_example_02.c | 4 ++-- src/examples/genlist_example_03.c | 4 ++-- src/examples/genlist_example_04.c | 4 ++-- src/examples/genlist_example_05.c | 8 ++++---- src/examples/glview_example_01.c | 4 +++- src/examples/hover_example_01.c | 1 + src/examples/hoversel_example_01.c | 1 + src/examples/icon_example_01.c | 4 ++-- src/examples/image_example_01.c | 2 +- src/examples/index_example_01.c | 5 +++-- src/examples/index_example_02.c | 5 +++-- src/examples/inwin_example.c | 5 +++-- src/examples/label_example_01.c | 1 + src/examples/layout_example_01.c | 4 ++-- src/examples/layout_example_02.c | 4 ++-- src/examples/layout_example_03.c | 4 ++-- src/examples/list_example_01.c | 2 ++ src/examples/list_example_02.c | 2 ++ src/examples/list_example_03.c | 2 ++ src/examples/map_example_01.c | 2 ++ src/examples/map_example_02.c | 2 ++ src/examples/map_example_03.c | 2 ++ src/examples/mapbuf_example.c | 2 ++ src/examples/menu_example_01.c | 1 + src/examples/notify_example_01.c | 1 + src/examples/panel_example_01.c | 1 + src/examples/panes_example.c | 4 +++- src/examples/photocam_example_01.c | 1 + src/examples/popup_example_01.c | 1 + src/examples/popup_example_02.c | 2 ++ src/examples/popup_example_03.c | 1 + src/examples/progressbar_example.c | 5 +++-- src/examples/radio_example_01.c | 1 + src/examples/scroller_example_01.c | 1 + src/examples/segment_control_example.c | 4 +++- src/examples/separator_example_01.c | 1 + src/examples/slider_example.c | 4 +++- src/examples/slideshow_example.c | 5 +++-- src/examples/spinner_example.c | 4 +++- src/examples/table_example_01.c | 1 + src/examples/table_example_02.c | 1 + src/examples/theme_example_01.c | 5 +++-- src/examples/theme_example_02.c | 5 +++-- src/examples/thumb_example_01.c | 3 +-- src/examples/toolbar_example_01.c | 2 ++ src/examples/toolbar_example_02.c | 2 ++ src/examples/toolbar_example_03.c | 2 ++ src/examples/transit_example_01.c | 4 ++-- src/examples/transit_example_02.c | 4 ++-- src/examples/transit_example_03.c | 4 ++-- src/examples/transit_example_04.c | 6 ++---- src/examples/web_example.c | 5 +++-- src/examples/win_example.c | 5 +++-- 98 files changed, 206 insertions(+), 111 deletions(-) diff --git a/src/examples/actionslider_example_01.c b/src/examples/actionslider_example_01.c index e09d8ae..2a0fbb9 100644 --- a/src/examples/actionslider_example_01.c +++ b/src/examples/actionslider_example_01.c @@ -147,6 +147,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } ELM_MAIN() diff --git a/src/examples/anchorblock_example_01.c b/src/examples/anchorblock_example_01.c index 06440c5..a5b3c73 100644 --- a/src/examples/anchorblock_example_01.c +++ b/src/examples/anchorblock_example_01.c @@ -11,7 +11,7 @@ static void _anchorblock_clicked_cb(void *data, Evas_Object *obj, void *ev); static void _anchorview_clicked_cb(void *data, Evas_Object *obj, void *ev); -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) { Evas_Object *win, *box, *o, *frame; @@ -80,10 +80,11 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) elm_object_content_set(frame, o); elm_run(); + elm_shutdown(); return 0; } -ELM_MAIN(); +ELM_MAIN() static void _anchor_buttons_create(Evas_Object *ao, Elm_Entry_Anchorblock_Info *info, Evas_Smart_Cb btn_end_cb); diff --git a/src/examples/bg_example_01.c b/src/examples/bg_example_01.c index c168a9f..6ce6258 100644 --- a/src/examples/bg_example_01.c +++ b/src/examples/bg_example_01.c @@ -15,7 +15,7 @@ on_done(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U elm_exit(); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg; @@ -52,5 +52,4 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) /* exit code */ return 0; } - ELM_MAIN() diff --git a/src/examples/bg_example_02.c b/src/examples/bg_example_02.c index 368830f..29f32a0 100644 --- a/src/examples/bg_example_02.c +++ b/src/examples/bg_example_02.c @@ -16,7 +16,7 @@ on_done(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U elm_exit(); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg; @@ -42,8 +42,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/bg_example_03.c b/src/examples/bg_example_03.c index 5ee8fb4..033b56a 100644 --- a/src/examples/bg_example_03.c +++ b/src/examples/bg_example_03.c @@ -61,7 +61,7 @@ _cb_color_changed(void *data, Evas_Object *obj, void *event __UNUSED__) elm_bg_color_set(o_bg, 0, 255, 0); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg; @@ -168,6 +168,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/box_example_02.c b/src/examples/box_example_02.c index 16ac525..7b1a5a3 100644 --- a/src/examples/box_example_02.c +++ b/src/examples/box_example_02.c @@ -71,7 +71,7 @@ _test_box_transition_change(void *data) tdata->transitions); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) { Evas_Object *win, *bg, *bigbox, *bx, *bt; @@ -167,7 +167,8 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) _test_box_transition_change(&tdata); elm_run(); + elm_shutdown(); return 0; } -ELM_MAIN(); +ELM_MAIN() diff --git a/src/examples/bubble_example_01.c b/src/examples/bubble_example_01.c index 21db797..47546bd 100644 --- a/src/examples/bubble_example_01.c +++ b/src/examples/bubble_example_01.c @@ -66,8 +66,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(bubble); elm_run(); - - evas_object_del(icon); + elm_shutdown(); return 0; } diff --git a/src/examples/button_example_00.c b/src/examples/button_example_00.c index 51b9a54..e35b80f 100644 --- a/src/examples/button_example_00.c +++ b/src/examples/button_example_00.c @@ -14,7 +14,7 @@ on_click(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __ elm_exit(); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win = NULL; @@ -47,8 +47,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(btn); elm_run(); + elm_shutdown(); return 0; } - -ELM_MAIN(); +ELM_MAIN() diff --git a/src/examples/button_example_01.c b/src/examples/button_example_01.c index 414dc2b..8b051c3 100644 --- a/src/examples/button_example_01.c +++ b/src/examples/button_example_01.c @@ -100,7 +100,7 @@ _btn_options_cb(void *data, Evas_Object *btn, void *ev __UNUSED__) } } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) { Evas_Object *win, *bg, *box, *box2, *btn, *icon; @@ -263,7 +263,8 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) data.cursors.down = btn; elm_run(); + elm_shutdown(); return 0; } -ELM_MAIN(); +ELM_MAIN() diff --git a/src/examples/calendar_example_01.c b/src/examples/calendar_example_01.c index e52afac..7be949d 100644 --- a/src/examples/calendar_example_01.c +++ b/src/examples/calendar_example_01.c @@ -39,6 +39,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/calendar_example_02.c b/src/examples/calendar_example_02.c index 9db3855..56a5d0d 100644 --- a/src/examples/calendar_example_02.c +++ b/src/examples/calendar_example_02.c @@ -57,6 +57,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/calendar_example_03.c b/src/examples/calendar_example_03.c index 9804dac..a54c892 100644 --- a/src/examples/calendar_example_03.c +++ b/src/examples/calendar_example_03.c @@ -41,6 +41,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/calendar_example_04.c b/src/examples/calendar_example_04.c index 55978ac..ed90a5d 100644 --- a/src/examples/calendar_example_04.c +++ b/src/examples/calendar_example_04.c @@ -60,6 +60,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/calendar_example_05.c b/src/examples/calendar_example_05.c index 9a2b702..5b45b3d 100644 --- a/src/examples/calendar_example_05.c +++ b/src/examples/calendar_example_05.c @@ -67,6 +67,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/calendar_example_06.c b/src/examples/calendar_example_06.c index dce81d4..60b13f8 100644 --- a/src/examples/calendar_example_06.c +++ b/src/examples/calendar_example_06.c @@ -94,6 +94,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/check_example_01.c b/src/examples/check_example_01.c index a232193..a0d99c5 100644 --- a/src/examples/check_example_01.c +++ b/src/examples/check_example_01.c @@ -51,7 +51,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); - evas_object_del(icon); + elm_shutdown(); return 0; } diff --git a/src/examples/clock_example.c b/src/examples/clock_example.c index b510b17..b511b5e 100644 --- a/src/examples/clock_example.c +++ b/src/examples/clock_example.c @@ -24,7 +24,7 @@ _on_done(void *data __UNUSED__, elm_exit(); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *bx, *ck; @@ -83,6 +83,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/colorselector_example_01.c b/src/examples/colorselector_example_01.c index a9225b7..43a6be4 100644 --- a/src/examples/colorselector_example_01.c +++ b/src/examples/colorselector_example_01.c @@ -67,6 +67,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/conformant_example_01.c b/src/examples/conformant_example_01.c index 0ea316d..4bbef18 100644 --- a/src/examples/conformant_example_01.c +++ b/src/examples/conformant_example_01.c @@ -74,6 +74,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/conformant_example_02.c b/src/examples/conformant_example_02.c index 0c05b05..a2ec8a3 100644 --- a/src/examples/conformant_example_02.c +++ b/src/examples/conformant_example_02.c @@ -80,6 +80,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/ctxpopup_example_01.c b/src/examples/ctxpopup_example_01.c index ed84b5c..2a82db5 100644 --- a/src/examples/ctxpopup_example_01.c +++ b/src/examples/ctxpopup_example_01.c @@ -104,6 +104,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) elm_list_go(list); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/datetime_example.c b/src/examples/datetime_example.c index 8e8ddf9..cbb011e 100644 --- a/src/examples/datetime_example.c +++ b/src/examples/datetime_example.c @@ -16,7 +16,7 @@ _on_done(void *data __UNUSED__, elm_exit(); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) { Evas_Object *win, *bg, *bx, *datetime; @@ -67,7 +67,8 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } -ELM_MAIN(); +ELM_MAIN() diff --git a/src/examples/dayselector_example.c b/src/examples/dayselector_example.c index 3eecbd4..265f9a6 100644 --- a/src/examples/dayselector_example.c +++ b/src/examples/dayselector_example.c @@ -50,7 +50,7 @@ static void _changed_cb(void* data __UNUSED__, Evas_Object* obj, void* event_inf } /* End of clicked callback */ -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *bx, *dayselector; @@ -90,6 +90,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/diskselector_example_01.c b/src/examples/diskselector_example_01.c index 58c4d39..d506e35 100644 --- a/src/examples/diskselector_example_01.c +++ b/src/examples/diskselector_example_01.c @@ -102,6 +102,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/diskselector_example_02.c b/src/examples/diskselector_example_02.c index 7f32aa7..0638d23 100644 --- a/src/examples/diskselector_example_02.c +++ b/src/examples/diskselector_example_02.c @@ -347,6 +347,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/efl_thread_1.c b/src/examples/efl_thread_1.c index 28fa6e4..bc91ca8 100644 --- a/src/examples/efl_thread_1.c +++ b/src/examples/efl_thread_1.c @@ -50,7 +50,7 @@ my_thread_new(void) perror("pthread_create"); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *o, *bg; @@ -77,7 +77,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) my_thread_new(); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/efl_thread_2.c b/src/examples/efl_thread_2.c index bb89ac4..377c43d 100644 --- a/src/examples/efl_thread_2.c +++ b/src/examples/efl_thread_2.c @@ -66,7 +66,7 @@ my_thread_mainloop_code(void *data) return NULL; } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *o, *bg; @@ -93,7 +93,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) my_thread_new(); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/efl_thread_3.c b/src/examples/efl_thread_3.c index 1cfbacb..2b1d025 100644 --- a/src/examples/efl_thread_3.c +++ b/src/examples/efl_thread_3.c @@ -68,7 +68,7 @@ my_thread_mainloop_code(void *data) free(inf); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *o, *bg; @@ -95,7 +95,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) my_thread_new(); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/efl_thread_4.c b/src/examples/efl_thread_4.c index 30841a8..517b805 100644 --- a/src/examples/efl_thread_4.c +++ b/src/examples/efl_thread_4.c @@ -88,7 +88,7 @@ down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi pthread_mutex_unlock(&th_lock); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *o, *bg; @@ -118,7 +118,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) my_thread_new(); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/efl_thread_5.c b/src/examples/efl_thread_5.c index 53bee89..7132eda 100644 --- a/src/examples/efl_thread_5.c +++ b/src/examples/efl_thread_5.c @@ -68,7 +68,7 @@ down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, voi ecore_thread_cancel(thr); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *o, *bg; @@ -102,7 +102,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) thr = ecore_thread_feedback_run(th_do, th_feedback, th_end, th_cancel, NULL, EINA_TRUE); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/efl_thread_6.c b/src/examples/efl_thread_6.c index 8517665..df42cd9 100644 --- a/src/examples/efl_thread_6.c +++ b/src/examples/efl_thread_6.c @@ -122,7 +122,7 @@ anim(void *data) return EINA_TRUE; } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *o, *bg; @@ -163,7 +163,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) } elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/efl_thread_win32_1.c b/src/examples/efl_thread_win32_1.c index 7cdf995..c670810 100644 --- a/src/examples/efl_thread_win32_1.c +++ b/src/examples/efl_thread_win32_1.c @@ -55,7 +55,7 @@ my_thread_new(void) } } -int +EAPI_MAIN int elm_main(int argc, char **argv) { Evas_Object *o, *bg; @@ -82,7 +82,8 @@ elm_main(int argc, char **argv) my_thread_new(); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/efl_thread_win32_2.c b/src/examples/efl_thread_win32_2.c index 101bfb4..cbc2796 100644 --- a/src/examples/efl_thread_win32_2.c +++ b/src/examples/efl_thread_win32_2.c @@ -71,7 +71,7 @@ my_thread_mainloop_code(void *data) return NULL; } -int +EAPI_MAIN int elm_main(int argc, char **argv) { Evas_Object *o, *bg; @@ -98,7 +98,8 @@ elm_main(int argc, char **argv) my_thread_new(); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/efl_thread_win32_3.c b/src/examples/efl_thread_win32_3.c index eff6fce..9b898ac 100644 --- a/src/examples/efl_thread_win32_3.c +++ b/src/examples/efl_thread_win32_3.c @@ -73,7 +73,7 @@ my_thread_mainloop_code(void *data) free(inf); } -int +EAPI_MAIN int elm_main(int argc, char **argv) { Evas_Object *o, *bg; @@ -100,7 +100,8 @@ elm_main(int argc, char **argv) my_thread_new(); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/efl_thread_win32_4.c b/src/examples/efl_thread_win32_4.c index f882d80..538ba71 100644 --- a/src/examples/efl_thread_win32_4.c +++ b/src/examples/efl_thread_win32_4.c @@ -94,7 +94,7 @@ down(void *data, Evas *e, Evas_Object *obj, void *event_info) LeaveCriticalSection(&lock); } -int +EAPI_MAIN int elm_main(int argc, char **argv) { Evas_Object *o, *bg; @@ -124,7 +124,8 @@ elm_main(int argc, char **argv) my_thread_new(); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/entry_example.c b/src/examples/entry_example.c index a3ab9c9..1bc55ce 100644 --- a/src/examples/entry_example.c +++ b/src/examples/entry_example.c @@ -494,7 +494,7 @@ _win_del_cb(void *data __UNUSED__, Evas_Object *obj, void *event __UNUSED__) elm_exit(); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) { Evas_Object *win, *bg, *box, *tb, *en, *o, *icon; @@ -578,7 +578,8 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_resize(win, 300, 780); elm_run(); + elm_shutdown(); return 0; } -ELM_MAIN(); +ELM_MAIN() diff --git a/src/examples/fileselector_button_example.c b/src/examples/fileselector_button_example.c index fdc26bd..9cac807 100644 --- a/src/examples/fileselector_button_example.c +++ b/src/examples/fileselector_button_example.c @@ -179,7 +179,8 @@ elm_main(int argc __UNUSED__, evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/fileselector_entry_example.c b/src/examples/fileselector_entry_example.c index 51fdc9c..97d2cbc 100644 --- a/src/examples/fileselector_entry_example.c +++ b/src/examples/fileselector_entry_example.c @@ -168,7 +168,8 @@ elm_main(int argc __UNUSED__, evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/fileselector_example.c b/src/examples/fileselector_example.c index b56985d..297ee77 100644 --- a/src/examples/fileselector_example.c +++ b/src/examples/fileselector_example.c @@ -238,7 +238,8 @@ elm_main(int argc __UNUSED__, evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/flip_example_01.c b/src/examples/flip_example_01.c index 95e84e2..f205e23 100644 --- a/src/examples/flip_example_01.c +++ b/src/examples/flip_example_01.c @@ -82,6 +82,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/flipselector_example.c b/src/examples/flipselector_example.c index 417490f..504116b 100644 --- a/src/examples/flipselector_example.c +++ b/src/examples/flipselector_example.c @@ -204,6 +204,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) fprintf(stdout, "%s", commands); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/frame_example_01.c b/src/examples/frame_example_01.c index dc0b6ca..ee0a40c 100644 --- a/src/examples/frame_example_01.c +++ b/src/examples/frame_example_01.c @@ -75,11 +75,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); - - evas_object_del(r1); - evas_object_del(r2); - evas_object_del(r3); - evas_object_del(r4); + elm_shutdown(); return 0; } diff --git a/src/examples/general_funcs_example.c b/src/examples/general_funcs_example.c index 70aee4b..225b8e0 100644 --- a/src/examples/general_funcs_example.c +++ b/src/examples/general_funcs_example.c @@ -68,7 +68,7 @@ _btn_scale_cb(void *data __UNUSED__, elm_object_scale_set(d.btn, elm_slider_value_get(obj)); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { @@ -190,5 +190,4 @@ elm_main(int argc __UNUSED__, /* exit code */ return 0; } - ELM_MAIN() diff --git a/src/examples/gengrid_example.c b/src/examples/gengrid_example.c index d55daba..b85378b 100644 --- a/src/examples/gengrid_example.c +++ b/src/examples/gengrid_example.c @@ -425,7 +425,7 @@ _page_change_cb(void *data, fprintf(stdout, "Setting grid page's relative size to %f\n", val); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { @@ -628,7 +628,8 @@ elm_main(int argc __UNUSED__, evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/genlist_example_01.c b/src/examples/genlist_example_01.c index da5d9ad..3ee6a8d 100644 --- a/src/examples/genlist_example_01.c +++ b/src/examples/genlist_example_01.c @@ -39,7 +39,7 @@ _item_sel_cb(void *data, Evas_Object *obj, void *event_info) data, obj, event_info); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg; @@ -87,8 +87,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/genlist_example_02.c b/src/examples/genlist_example_02.c index 6f72cc1..6323c6e 100644 --- a/src/examples/genlist_example_02.c +++ b/src/examples/genlist_example_02.c @@ -88,7 +88,7 @@ _realize_cb(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED__) elm_genlist_realized_items_update(list); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *box, *hbox; @@ -201,8 +201,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/genlist_example_03.c b/src/examples/genlist_example_03.c index ec25ced..755c900 100644 --- a/src/examples/genlist_example_03.c +++ b/src/examples/genlist_example_03.c @@ -78,7 +78,7 @@ _genlist_fill(Evas_Object *list) } } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *box; @@ -129,8 +129,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/genlist_example_04.c b/src/examples/genlist_example_04.c index 0c40330..785e7f4 100644 --- a/src/examples/genlist_example_04.c +++ b/src/examples/genlist_example_04.c @@ -236,7 +236,7 @@ _button_add(Evas_Object *list, Evas_Object *box, const char *label, Evas_Smart_C return bt; } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *box, *fbox; @@ -362,8 +362,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/genlist_example_05.c b/src/examples/genlist_example_05.c index ad33157..850c1c1 100644 --- a/src/examples/genlist_example_05.c +++ b/src/examples/genlist_example_05.c @@ -307,7 +307,7 @@ _button_add(Evas_Object *list, Evas_Object *box, const char *label, Evas_Smart_C return bt; } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *box, *fbox; @@ -340,7 +340,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) _itc->func.state_get = NULL; _itc->func.del = NULL; } - + if (!_itp) { _itp = elm_genlist_item_class_new(); @@ -350,7 +350,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) _itp->func.state_get = NULL; _itp->func.del = NULL; } - + if (!_itfav) { _itfav = elm_genlist_item_class_new(); @@ -423,8 +423,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/glview_example_01.c b/src/examples/glview_example_01.c index 3e06a51..e196393 100644 --- a/src/examples/glview_example_01.c +++ b/src/examples/glview_example_01.c @@ -245,7 +245,7 @@ _del(void *data, Evas *evas, Evas_Object *obj, void *event_info) } -EAPI int +EAPI_MAIN int elm_main(int argc, char **argv) { Evas_Object *win, *bg, *bx, *bt, *gl; @@ -332,6 +332,8 @@ elm_main(int argc, char **argv) // run the mainloop and process events and callbacks elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/hover_example_01.c b/src/examples/hover_example_01.c index 25dbc10..536ecd0 100644 --- a/src/examples/hover_example_01.c +++ b/src/examples/hover_example_01.c @@ -78,6 +78,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/hoversel_example_01.c b/src/examples/hoversel_example_01.c index de053cd..14614ce 100644 --- a/src/examples/hoversel_example_01.c +++ b/src/examples/hoversel_example_01.c @@ -56,6 +56,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/icon_example_01.c b/src/examples/icon_example_01.c index 8fc365d..5566ebe 100644 --- a/src/examples/icon_example_01.c +++ b/src/examples/icon_example_01.c @@ -9,7 +9,7 @@ # define PACKAGE_DATA_DIR "." #endif -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *icon; @@ -52,8 +52,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/image_example_01.c b/src/examples/image_example_01.c index f3b2652..da52bf0 100644 --- a/src/examples/image_example_01.c +++ b/src/examples/image_example_01.c @@ -53,8 +53,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/index_example_01.c b/src/examples/index_example_01.c index 1a49ae0..dca66d7 100644 --- a/src/examples/index_example_01.c +++ b/src/examples/index_example_01.c @@ -111,7 +111,7 @@ _on_done(void *data __UNUSED__, elm_exit(); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { @@ -207,7 +207,8 @@ elm_main(int argc __UNUSED__, evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/index_example_02.c b/src/examples/index_example_02.c index 253ec30..b9d9d7b 100644 --- a/src/examples/index_example_02.c +++ b/src/examples/index_example_02.c @@ -92,7 +92,7 @@ _index_icmp(const void *data1, return strcasecmp(label1, label2); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { @@ -149,7 +149,8 @@ elm_main(int argc __UNUSED__, elm_index_autohide_disabled_set(idx, EINA_FALSE); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/inwin_example.c b/src/examples/inwin_example.c index 7ec74ae..1bd78dc 100644 --- a/src/examples/inwin_example.c +++ b/src/examples/inwin_example.c @@ -113,7 +113,7 @@ _screenshot_hack_cb(void *data) return EINA_FALSE; } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) { Evas_Object *win, *bg, *box, *o; @@ -150,7 +150,8 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) ecore_timer_add(0.1, _screenshot_hack_cb, o); elm_run(); + elm_shutdown(); return 0; } -ELM_MAIN(); +ELM_MAIN() diff --git a/src/examples/label_example_01.c b/src/examples/label_example_01.c index 89ed296..c8a4e4a 100644 --- a/src/examples/label_example_01.c +++ b/src/examples/label_example_01.c @@ -78,6 +78,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/layout_example_01.c b/src/examples/layout_example_01.c index b550972..4b959e2 100644 --- a/src/examples/layout_example_01.c +++ b/src/examples/layout_example_01.c @@ -56,7 +56,7 @@ _swallow_btn_cb(void *data, Evas_Object *btn __UNUSED__, void *event_info __UNUS evas_object_del(item); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *icon, *icon2, *bt, *bt2, *layout; @@ -148,8 +148,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/layout_example_02.c b/src/examples/layout_example_02.c index ad81d65..c9cd405 100644 --- a/src/examples/layout_example_02.c +++ b/src/examples/layout_example_02.c @@ -40,7 +40,7 @@ _signal_cb(void *data, Evas_Object *o, const char *emission, const char *source elm_icon_standard_set(icon, images[app->current]); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *layout, *icon; @@ -81,8 +81,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/layout_example_03.c b/src/examples/layout_example_03.c index ec27e80..be70c98 100644 --- a/src/examples/layout_example_03.c +++ b/src/examples/layout_example_03.c @@ -45,7 +45,7 @@ _size_changed_cb(void *data __UNUSED__, Evas_Object *layout, const char *emissio printf("Minimum size for this theme: %dx%d\n", w, h); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *btn, *layout; @@ -92,8 +92,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/list_example_01.c b/src/examples/list_example_01.c index 300a745..f495c95 100644 --- a/src/examples/list_example_01.c +++ b/src/examples/list_example_01.c @@ -69,6 +69,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/list_example_02.c b/src/examples/list_example_02.c index 4d52882..9c557ea 100644 --- a/src/examples/list_example_02.c +++ b/src/examples/list_example_02.c @@ -83,6 +83,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/list_example_03.c b/src/examples/list_example_03.c index 3875e20..725aff1 100644 --- a/src/examples/list_example_03.c +++ b/src/examples/list_example_03.c @@ -439,6 +439,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/map_example_01.c b/src/examples/map_example_01.c index 6339745..f76f125 100644 --- a/src/examples/map_example_01.c +++ b/src/examples/map_example_01.c @@ -119,6 +119,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) ecore_timer_add(0.5, _nasty_hack, win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/map_example_02.c b/src/examples/map_example_02.c index e0c9215..e6120f1 100644 --- a/src/examples/map_example_02.c +++ b/src/examples/map_example_02.c @@ -256,6 +256,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) ecore_timer_add(1, _nasty_hack, win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/map_example_03.c b/src/examples/map_example_03.c index e9e540f..b1f5f8b 100644 --- a/src/examples/map_example_03.c +++ b/src/examples/map_example_03.c @@ -206,6 +206,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) ecore_timer_add(0.5, _nasty_hack, win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/mapbuf_example.c b/src/examples/mapbuf_example.c index b5637b6..ce00cac 100644 --- a/src/examples/mapbuf_example.c +++ b/src/examples/mapbuf_example.c @@ -124,6 +124,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/menu_example_01.c b/src/examples/menu_example_01.c index c3d9ec5..f3a75f3 100644 --- a/src/examples/menu_example_01.c +++ b/src/examples/menu_example_01.c @@ -71,6 +71,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/notify_example_01.c b/src/examples/notify_example_01.c index 2386960..87ab6ed 100644 --- a/src/examples/notify_example_01.c +++ b/src/examples/notify_example_01.c @@ -71,6 +71,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/panel_example_01.c b/src/examples/panel_example_01.c index edd3d32..cfe6b40 100644 --- a/src/examples/panel_example_01.c +++ b/src/examples/panel_example_01.c @@ -73,6 +73,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/panes_example.c b/src/examples/panes_example.c index f9bbc08..e5ee156 100644 --- a/src/examples/panes_example.c +++ b/src/examples/panes_example.c @@ -60,7 +60,7 @@ _clicked_double(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUS } } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *panes, *panes_h, *bt; @@ -120,6 +120,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/photocam_example_01.c b/src/examples/photocam_example_01.c index 518b0a1..a63fef3 100644 --- a/src/examples/photocam_example_01.c +++ b/src/examples/photocam_example_01.c @@ -61,6 +61,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/popup_example_01.c b/src/examples/popup_example_01.c index 1d0747f..7cdcf67 100644 --- a/src/examples/popup_example_01.c +++ b/src/examples/popup_example_01.c @@ -46,6 +46,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_resize(win, 480, 800); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/popup_example_02.c b/src/examples/popup_example_02.c index 48d0eba..886010f 100644 --- a/src/examples/popup_example_02.c +++ b/src/examples/popup_example_02.c @@ -73,10 +73,12 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } ELM_MAIN() + static void _response_cb(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) diff --git a/src/examples/popup_example_03.c b/src/examples/popup_example_03.c index 1f6993a..6bb4198 100644 --- a/src/examples/popup_example_03.c +++ b/src/examples/popup_example_03.c @@ -83,6 +83,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/progressbar_example.c b/src/examples/progressbar_example.c index 5a7ef9b..9791961 100644 --- a/src/examples/progressbar_example.c +++ b/src/examples/progressbar_example.c @@ -96,7 +96,7 @@ _on_done(void *data __UNUSED__, elm_exit(); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { @@ -236,7 +236,8 @@ elm_main(int argc __UNUSED__, evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/radio_example_01.c b/src/examples/radio_example_01.c index 55dec3a..b030d5d 100644 --- a/src/examples/radio_example_01.c +++ b/src/examples/radio_example_01.c @@ -82,6 +82,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/scroller_example_01.c b/src/examples/scroller_example_01.c index 5d1758d..4239f05 100644 --- a/src/examples/scroller_example_01.c +++ b/src/examples/scroller_example_01.c @@ -140,6 +140,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/segment_control_example.c b/src/examples/segment_control_example.c index c527c2e..cc5b3ca 100644 --- a/src/examples/segment_control_example.c +++ b/src/examples/segment_control_example.c @@ -24,7 +24,7 @@ _on_done(void *data __UNUSED__, elm_exit(); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *sc, *ic; @@ -81,6 +81,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/separator_example_01.c b/src/examples/separator_example_01.c index 68638e6..937838d 100644 --- a/src/examples/separator_example_01.c +++ b/src/examples/separator_example_01.c @@ -53,6 +53,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/slider_example.c b/src/examples/slider_example.c index 92a04f9..b19a662 100644 --- a/src/examples/slider_example.c +++ b/src/examples/slider_example.c @@ -52,7 +52,7 @@ _indicator_free(char *str) free(str); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *bx, *sl, *ic; @@ -147,6 +147,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/slideshow_example.c b/src/examples/slideshow_example.c index 4d2ba3d..a44768e 100644 --- a/src/examples/slideshow_example.c +++ b/src/examples/slideshow_example.c @@ -179,7 +179,7 @@ _cmp_func(const void *data1, return strcasecmp(img_path1, img_path2); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { @@ -317,7 +317,8 @@ elm_main(int argc __UNUSED__, _notify_show(notify, NULL, NULL, NULL); elm_run(); + elm_shutdown(); + return 0; } - ELM_MAIN() diff --git a/src/examples/spinner_example.c b/src/examples/spinner_example.c index 10dcf9d..8990b12 100644 --- a/src/examples/spinner_example.c +++ b/src/examples/spinner_example.c @@ -36,7 +36,7 @@ _delay_changed_cb(void *data __UNUSED__, Evas_Object *obj, void *event_info __UN printf("Value delay changed to %0.f\n", elm_spinner_value_get(obj)); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *bx, *sp; @@ -130,6 +130,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/table_example_01.c b/src/examples/table_example_01.c index 6b4e8e0..1e5ae04 100644 --- a/src/examples/table_example_01.c +++ b/src/examples/table_example_01.c @@ -51,6 +51,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/table_example_02.c b/src/examples/table_example_02.c index a6b20c8..1e28685 100644 --- a/src/examples/table_example_02.c +++ b/src/examples/table_example_02.c @@ -54,6 +54,7 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } diff --git a/src/examples/theme_example_01.c b/src/examples/theme_example_01.c index 327edac..1c1b5b4 100644 --- a/src/examples/theme_example_01.c +++ b/src/examples/theme_example_01.c @@ -39,7 +39,7 @@ btn_style_click_cb(void *data __UNUSED__, Evas_Object *btn, void *ev __UNUSED__) elm_object_style_set(btn, styles[sel_style]); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) { Evas_Object *win, *bg, *box, *btn; @@ -77,7 +77,8 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_smart_callback_add(btn, "clicked", btn_style_click_cb, NULL); elm_run(); + elm_shutdown(); return 0; } -ELM_MAIN(); +ELM_MAIN() diff --git a/src/examples/theme_example_02.c b/src/examples/theme_example_02.c index 8ac2d07..244eabd 100644 --- a/src/examples/theme_example_02.c +++ b/src/examples/theme_example_02.c @@ -19,7 +19,7 @@ _btn_clicked_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *ev __U loaded = 1 - loaded; } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) { Evas_Object *win, *bg, *box, *btn; @@ -68,7 +68,8 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_smart_callback_add(btn, "clicked", _btn_clicked_cb, NULL); elm_run(); + elm_shutdown(); return 0; } -ELM_MAIN(); +ELM_MAIN() diff --git a/src/examples/thumb_example_01.c b/src/examples/thumb_example_01.c index 5891672..e6f0326 100644 --- a/src/examples/thumb_example_01.c +++ b/src/examples/thumb_example_01.c @@ -27,7 +27,7 @@ _generation_error_cb(void *data __UNUSED__, Evas_Object *o __UNUSED__, void *eve printf("thumbnail generation error.\n"); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { #if 0 @@ -83,5 +83,4 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) /* exit code */ return 0; } - ELM_MAIN() diff --git a/src/examples/toolbar_example_01.c b/src/examples/toolbar_example_01.c index a5e6b03..855627f 100644 --- a/src/examples/toolbar_example_01.c +++ b/src/examples/toolbar_example_01.c @@ -95,6 +95,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/toolbar_example_02.c b/src/examples/toolbar_example_02.c index 58d5858..5e0437b 100644 --- a/src/examples/toolbar_example_02.c +++ b/src/examples/toolbar_example_02.c @@ -86,6 +86,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/toolbar_example_03.c b/src/examples/toolbar_example_03.c index a5fef05..0314629 100644 --- a/src/examples/toolbar_example_03.c +++ b/src/examples/toolbar_example_03.c @@ -79,6 +79,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); + return 0; } ELM_MAIN() diff --git a/src/examples/transit_example_01.c b/src/examples/transit_example_01.c index f6c93dc..a18b15c 100644 --- a/src/examples/transit_example_01.c +++ b/src/examples/transit_example_01.c @@ -15,7 +15,7 @@ on_done(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __U elm_exit(); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *bt; @@ -50,8 +50,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) elm_transit_go(trans); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/transit_example_02.c b/src/examples/transit_example_02.c index 96aa12b..28695a5 100644 --- a/src/examples/transit_example_02.c +++ b/src/examples/transit_example_02.c @@ -8,7 +8,7 @@ # define __UNUSED__ #endif -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *bt, *bt2, *bt3, *bt4; @@ -83,8 +83,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) elm_transit_chain_transit_add(trans3, trans4); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/transit_example_03.c b/src/examples/transit_example_03.c index 331d76d..c0671ef 100644 --- a/src/examples/transit_example_03.c +++ b/src/examples/transit_example_03.c @@ -174,7 +174,7 @@ _cb_tween_changed(void *data, Evas_Object *obj, void *event __UNUSED__) *mode = ELM_TRANSIT_TWEEN_MODE_ACCELERATE; } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *obj, *icon, *box, *vbox, *vbox2, *hbox, *btn; @@ -328,8 +328,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/transit_example_04.c b/src/examples/transit_example_04.c index 576101a..9e5dcdf 100644 --- a/src/examples/transit_example_04.c +++ b/src/examples/transit_example_04.c @@ -90,7 +90,7 @@ _transit_start(void *data, Evas_Object *o __UNUSED__, void *event_info __UNUSED_ elm_transit_go(trans); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char **argv __UNUSED__) { Evas_Object *win, *bg, *obj, *icon, *box, *vbox, *btn, *dummy; @@ -170,10 +170,8 @@ elm_main(int argc __UNUSED__, char **argv __UNUSED__) evas_object_show(win); elm_run(); - - eina_list_free(objs); + elm_shutdown(); return 0; } - ELM_MAIN() diff --git a/src/examples/web_example.c b/src/examples/web_example.c index 41d4a77..9d8d640 100644 --- a/src/examples/web_example.c +++ b/src/examples/web_example.c @@ -464,7 +464,7 @@ default_content_set(Evas_Object *web) #endif } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) { Evas_Object *win, *bg, *box, *box2, *btn, *ic, *url, *naviframe, *tabs, *web; @@ -621,7 +621,8 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) evas_object_show(win); elm_run(); + elm_shutdown(); return 0; } -ELM_MAIN(); +ELM_MAIN() diff --git a/src/examples/win_example.c b/src/examples/win_example.c index 8923af3..48e0952 100644 --- a/src/examples/win_example.c +++ b/src/examples/win_example.c @@ -175,7 +175,7 @@ _win_focused_cb(void *data, Evas_Object *obj __UNUSED__, void *event __UNUSED__) printf("Window focused: %s\n", name); } -int +EAPI_MAIN int elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) { Evas_Object *win, *win2, *bg, *bigbox, *box, *btn, *o; @@ -324,7 +324,8 @@ elm_main(int argc __UNUSED__, char *argv[] __UNUSED__) WIN_ACTION(sticky); elm_run(); + elm_shutdown(); return 0; } -ELM_MAIN(); +ELM_MAIN() -- 2.7.4