diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-04-28 08:32:51 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-04-28 08:32:51 +0300 |
| commit | 9c69984f8bf4830c6c0831bc66b128f86143d98f (patch) | |
| tree | 7a33a868708ef62a2ab5c78463603ba01c1f40f9 | |
| parent | df92f499f963a5a4d8cb7100ea1f846bb0f91014 (diff) | |
Bin the unused vague SAL_IMPLEMENT_MAIN_WITH_GUI idea
Change-Id: I66dae812f3aea0534907316a7fb41b35ad37be48
| -rw-r--r-- | sal/inc/sal/main.h | 17 | ||||
| -rw-r--r-- | vcl/source/salmain/salmain.cxx | 2 | ||||
| -rw-r--r-- | vcl/workben/svdem.cxx | 2 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 2 |
4 files changed, 3 insertions, 20 deletions
diff --git a/sal/inc/sal/main.h b/sal/inc/sal/main.h index 0f68012bd057..c85bc5a40b56 100644 --- a/sal/inc/sal/main.h +++ b/sal/inc/sal/main.h @@ -63,8 +63,6 @@ __attribute__ ((visibility("default"))) void lo_main(int argc, char **argv) \ sal_detail_deinitialize(); \ } -#define SAL_MAIN_WITH_GUI_IMPL SAL_MAIN_IMPL - #else #define SAL_MAIN_WITH_ARGS_IMPL \ @@ -87,8 +85,6 @@ int SAL_CALL main(int argc, char ** argv) \ return ret; \ } -#define SAL_MAIN_WITH_GUI_IMPL SAL_MAIN_IMPL - #endif @@ -149,19 +145,6 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nsh SAL_WIN_WinMain \ static int SAL_CALL sal_main(void) -/* Use SAL_IMPLEMENT_MAIN_WITH_GUI in programs that actually have a - * VCL GUI. The difference is meaningful only for iOS support, which - * of course is a highly experimental work in progress. So actually, - * don't bother, just let developers who care for iOS take care of it - * when/if necessary. - */ - -#define SAL_IMPLEMENT_MAIN_WITH_GUI() \ - static int SAL_CALL sal_main(void); \ - SAL_MAIN_WITH_GUI_IMPL \ - SAL_WIN_WinMain \ - static int SAL_CALL sal_main(void) - /* "How to use" Examples: diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx index d3c38c8b1cf8..1a8c4d8ba16f 100644 --- a/vcl/source/salmain/salmain.cxx +++ b/vcl/source/salmain/salmain.cxx @@ -35,7 +35,7 @@ #include "salinst.hxx" -SAL_IMPLEMENT_MAIN_WITH_GUI() { +SAL_IMPLEMENT_MAIN() { tools::extendApplicationEnvironment(); return SVMain(); } diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx index 53f3353f497e..8e9baa73ac46 100644 --- a/vcl/workben/svdem.cxx +++ b/vcl/workben/svdem.cxx @@ -49,7 +49,7 @@ void Main(); // ----------------------------------------------------------------------- -SAL_IMPLEMENT_MAIN_WITH_GUI() +SAL_IMPLEMENT_MAIN() { tools::extendApplicationEnvironment(); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index d0caa0015056..7df524a81599 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -52,7 +52,7 @@ void Main(); // ----------------------------------------------------------------------- -SAL_IMPLEMENT_MAIN_WITH_GUI() +SAL_IMPLEMENT_MAIN() { tools::extendApplicationEnvironment(); |