Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

[wxWidgets.git] / src / unix / utilsunx.cpp

diff --git a/src/unix/utilsunx.cpp b/src/unix/utilsunx.cpp
index 6a7fcd27be36e7b9d9e57200bbae4de2b49f3a3a..a09fb424df8fca1bcc043df3dba4d49dff65dad3 100644 (file)
--- a/src/unix/utilsunx.cpp
+++ b/src/unix/utilsunx.cpp
@@ -992,7 +992,7 @@ wxLinuxDistributionInfo wxGetLinuxDistributionInfo()
 #endif
 
 // these functions are in src/osx/utilsexc_base.cpp for wxMac
 #endif
 
 // these functions are in src/osx/utilsexc_base.cpp for wxMac

-#ifndef __WXMAC__
+#ifndef __DARWIN__

 
 wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 {
 
 wxOperatingSystemId wxGetOsVersion(int *verMaj, int *verMin)
 {


@@ -1028,7 +1028,7 @@ wxString wxGetOsDescription()
     return wxGetCommandOutput(wxT("uname -s -r -m"));
 }
 
     return wxGetCommandOutput(wxT("uname -s -r -m"));
 }
 

-#endif // !__WXMAC__
+#endif // !__DARWIN__

 
 unsigned long wxGetProcessId()
 {
 
 unsigned long wxGetProcessId()
 {