Use __DARWIN__ instead of __WXOSX__ in non-GUI code.
This fixes compilation of non-wxOSX ports (e.g. wxGTK) under OS X. Also make the difference between the two symbols more clear in the documentation. Closes #14503. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72180 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -992,7 +992,7 @@ wxLinuxDistributionInfo wxGetLinuxDistributionInfo()
|
||||
#endif
|
||||
|
||||
// these functions are in src/osx/utilsexc_base.cpp for wxMac
|
||||
#ifndef __WXMAC__
|
||||
#ifndef __DARWIN__
|
||||
|
||||
wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
|
||||
{
|
||||
@@ -1028,7 +1028,7 @@ wxString wxGetOsDescription()
|
||||
return wxGetCommandOutput(wxT("uname -s -r -m"));
|
||||
}
|
||||
|
||||
#endif // !__WXMAC__
|
||||
#endif // !__DARWIN__
|
||||
|
||||
unsigned long wxGetProcessId()
|
||||
{
|
||||
|
Reference in New Issue
Block a user