Adapted SetData function to common API (taking a reference

[wxWidgets.git] / include / wx / wxchar.h

diff --git a/include/wx/wxchar.h b/include/wx/wxchar.h
index 0ab57e3987d6cb696078c07341f477712bce5c77..2bd6a651141d3a983fa48a4fe4dfe61247ee09fb 100644 (file)
--- a/include/wx/wxchar.h
+++ b/include/wx/wxchar.h
@@ -366,7 +366,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #     define wxUChar unsigned char
 #   endif
 
-#   if defined(__FreeBSD__) || defined(__MACH__)
+#   if defined(__FreeBSD__) || (defined(__APPLE__) && defined(__UNIX__))
 #     undef _T
 #   endif
 
@@ -419,7 +419,7 @@ typedef unsigned __WCHAR_TYPE__ wxUChar;
 #  elif defined(__SC__) || defined(__VISUALC__) || (defined(__MWERKS__) && defined(__INTEL__))
 #    define wxStricmp _stricmp
 #    define wxStrnicmp _strnicmp
-#  elif defined(__UNIX__) || defined(__GNUWIN32__) || defined(__MACH__)
+#  elif defined(__UNIX__) || defined(__GNUWIN32__)
 #    define wxStricmp strcasecmp
 #    define wxStrnicmp strncasecmp
 #  elif defined(__MWERKS__) && !defined(__INTEL__)