fixed wxFSVolume definition if !wxUSE_GUI

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 7aff61182ba2af2c5636bef4e909e258a00796cf..63472e8655c729488e098efdcbef85ccb16529fc 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -1,13 +1,13 @@
-/*
- * Name:        wx/platform.h
- * Purpose:     define the OS and compiler identification macros
- * Author:      Vadim Zeitlin
- * Modified by:
- * Created:     29.10.01 (extracted from wx/defs.h)
- * RCS-ID:      $Id$
- * Copyright:   (c) 1997-2001 wxWindows team
- * Licence:     wxWindows licence
- */
+/**
+* Name:        wx/platform.h
+* Purpose:     define the OS and compiler identification macros
+* Author:      Vadim Zeitlin
+* Modified by:
+* Created:     29.10.01 (extracted from wx/defs.h)
+* RCS-ID:      $Id$
+* Copyright:   (c) 1997-2001 wxWindows team
+* Licence:     wxWindows licence
+*/
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
 
@@ -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.
@@ -347,7 +374,7 @@
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
  */
 #ifndef wxUSE_IDLEMENUUPDATES
-#    if defined(__WXMSW__) || defined(__WXGTK__)
+#    if (defined(__WXMSW__) || defined(__WXGTK__)) && !defined(__WXUNIVERSAL__)
 #        define wxUSE_IDLEMENUUPDATES 0
 #    else
 #        define wxUSE_IDLEMENUUPDATES 1