From 1cf41eced6590f9f06bb3b2e0da09aeb323cb138 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 19 Oct 2017 19:01:08 +0200 Subject: [PATCH] Use __DARWIN__ for -psn command line argument test This code should be used in all ports that can be used under macOS, i.e. also wxGTK and not just wxMac. Closes #15432. --- src/common/appcmn.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp index bc48e9fc4d..0379985eba 100644 --- a/src/common/appcmn.cpp +++ b/src/common/appcmn.cpp @@ -83,7 +83,7 @@ wxAppBase::wxAppBase() bool wxAppBase::Initialize(int& argcOrig, wxChar **argvOrig) { -#ifdef __WXOSX__ +#ifdef __DARWIN__ // Mac OS X passes a process serial number command line argument when // the application is launched from the Finder. This argument must be // 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*)); } } -#endif // __WXOSX__ +#endif // __DARWIN__ if ( !wxAppConsole::Initialize(argcOrig, argvOrig) ) return false;