Kaydet (Commit) 9c69984f authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Bin the unused vague SAL_IMPLEMENT_MAIN_WITH_GUI idea

Change-Id: I66dae812f3aea0534907316a7fb41b35ad37be48
üst df92f499
...@@ -63,8 +63,6 @@ __attribute__ ((visibility("default"))) void lo_main(int argc, char **argv) \ ...@@ -63,8 +63,6 @@ __attribute__ ((visibility("default"))) void lo_main(int argc, char **argv) \
sal_detail_deinitialize(); \ sal_detail_deinitialize(); \
} }
#define SAL_MAIN_WITH_GUI_IMPL SAL_MAIN_IMPL
#else #else
#define SAL_MAIN_WITH_ARGS_IMPL \ #define SAL_MAIN_WITH_ARGS_IMPL \
...@@ -87,8 +85,6 @@ int SAL_CALL main(int argc, char ** argv) \ ...@@ -87,8 +85,6 @@ int SAL_CALL main(int argc, char ** argv) \
return ret; \ return ret; \
} }
#define SAL_MAIN_WITH_GUI_IMPL SAL_MAIN_IMPL
#endif #endif
...@@ -149,19 +145,6 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nsh ...@@ -149,19 +145,6 @@ int WINAPI WinMain( HINSTANCE _hinst, HINSTANCE _dummy, char* _cmdline, int _nsh
SAL_WIN_WinMain \ SAL_WIN_WinMain \
static int SAL_CALL sal_main(void) 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: "How to use" Examples:
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
#include "salinst.hxx" #include "salinst.hxx"
SAL_IMPLEMENT_MAIN_WITH_GUI() { SAL_IMPLEMENT_MAIN() {
tools::extendApplicationEnvironment(); tools::extendApplicationEnvironment();
return SVMain(); return SVMain();
} }
......
...@@ -49,7 +49,7 @@ void Main(); ...@@ -49,7 +49,7 @@ void Main();
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
SAL_IMPLEMENT_MAIN_WITH_GUI() SAL_IMPLEMENT_MAIN()
{ {
tools::extendApplicationEnvironment(); tools::extendApplicationEnvironment();
......
...@@ -52,7 +52,7 @@ void Main(); ...@@ -52,7 +52,7 @@ void Main();
// ----------------------------------------------------------------------- // -----------------------------------------------------------------------
SAL_IMPLEMENT_MAIN_WITH_GUI() SAL_IMPLEMENT_MAIN()
{ {
tools::extendApplicationEnvironment(); tools::extendApplicationEnvironment();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment