Add wxBitmap::GetNSImage() which creates an autoreleased NSImage either

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 7aff61182ba2af2c5636bef4e909e258a00796cf..b87b204f8e404da475a642dd7ba22c00ceed17a0 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -103,6 +103,33 @@
 /* check the consistency of the settings in setup.h */
 #include "wx/chkconf.h"
 
+/*
+   adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1
+   and is used by wxWindows, _UNICODE and/or UNICODE may be defined or used by
+   the system headers so bring these settings in sync
+ */
+
+/* set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined */
+#if defined(_UNICODE) || defined(UNICODE)
+#   undef wxUSE_UNICODE
+#   define wxUSE_UNICODE 1
+#else /* !UNICODE */
+#   ifndef wxUSE_UNICODE
+#       define wxUSE_UNICODE 0
+#   endif
+#endif /* UNICODE/!UNICODE */
+
+/* and vice versa: define UNICODE and _UNICODE if wxUSE_UNICODE is 1 */
+#if wxUSE_UNICODE
+#   ifndef _UNICODE
+#       define _UNICODE
+#   endif
+#   ifndef UNICODE
+#       define UNICODE
+#   endif
+#endif /* wxUSE_UNICODE */
+
+
 /*
    some compilers don't support iostream.h any longer, so override the users
    setting here in such case.