Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use __DARWIN__ for -psn command line argument test

Browse Source 
This code should be used in all ports that can be used under macOS, i.e.
also wxGTK and not just wxMac.

Closes #15432.
This commit is contained in:
Vadim Zeitlin
2017-10-19 19:01:08 +02:00
parent 8fca138d29
commit 1cf41eced6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/appcmn.cpp
View File

@@ -83,7 +83,7 @@ wxAppBase::wxAppBase()
bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig) bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig)
{ {
#ifdef __WXOSX__ #ifdef __DARWIN__
// Mac OS X passes a process serial number command line argument when // Mac OS X passes a process serial number command line argument when
// the application is launched from the Finder. This argument must be // the application is launched from the Finder. This argument must be
// removed from the command line arguments before being handled by the // removed from the command line arguments before being handled by the
@@ -102,7 +102,7 @@ bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig)
memmove(argvOrig + 1, argvOrig + 2, argcOrig * sizeof(wxChar*)); memmove(argvOrig + 1, argvOrig + 2, argcOrig * sizeof(wxChar*));
} }
} }
#endif // __WXOSX__ #endif // __DARWIN__
if ( !wxAppConsole::Initialize(argcOrig, argvOrig) ) if ( !wxAppConsole::Initialize(argcOrig, argvOrig) )
return false; return false;