From a8d40d0d5f6f375c791cb8bb51e61dddda0bc1e4 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 9 Jan 2009 11:34:55 +0000 Subject: [PATCH] provide a #defined macro for the standard main() for elementary apps. SVN revision: 38510 --- legacy/elementary/src/bin/test.c | 15 ++------------- legacy/elementary/src/lib/Elementary.h.in | 3 ++- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c index e30ed248f2..30a1b7e549 100644 --- a/legacy/elementary/src/bin/test.c +++ b/legacy/elementary/src/bin/test.c @@ -2017,16 +2017,5 @@ elm_main(int argc, char **argv) /* exit code */ return 0; } - -int -main(int argc, char **argv) -{ - /* init Elementary (all Elementary calls begin with elm_ and all data - * types, enums and macros will be Elm_ and ELM_ etc.) */ - elm_init(argc, argv); - /* this must be called right after elm_init(). this function is used for - * fast-starting elementary apps by caching a pre-init and x connect etc. - * in elm_init(). the ONLY call allowed to be done before elm_main() is - * elm_init() and nothing else. */ - return elm_main(argc, argv); -} +/* all emeentary apps should use this. but it right after elm_main() */ +ELM_MAIN() diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in index 374c8cd7b8..ddd94ed699 100644 --- a/legacy/elementary/src/lib/Elementary.h.in +++ b/legacy/elementary/src/lib/Elementary.h.in @@ -130,6 +130,8 @@ extern "C" { ELM_WIN_KEYBOARD_TERMINAL, ELM_WIN_KEYBOARD_PASSWORD } Elm_Win_Keyboard_Mode; + +#define ELM_MAIN() int main(int argc, char **argv) {elm_init(argc, argv); return elm_main(argc, argv);} /**************************************************************************/ /* General calls */ @@ -425,7 +427,6 @@ extern "C" { EAPI const void *elm_list_item_data_get(Elm_List_Item *item); EAPI Evas_Object *elm_list_item_icon_get(Elm_List_Item *item); EAPI Evas_Object *elm_list_item_end_get(Elm_List_Item *item); - /* smart callbacks called: * "clicked" - when the user double-clicked an item * "selected" - when the user selected an item