X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63e7198ba8304880bc279e0e99f1ed7b49e35d96..af3aefcf062c4d5e81e0711b1ff8ef7356c5f64c:/include/wx/platform.h

diff --git a/include/wx/platform.h b/include/wx/platform.h
index b87b204f8e..5c7ad3b8a6 100644
--- 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 */
 
@@ -348,9 +348,10 @@
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */
-#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
+#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
     defined( __CYGWIN__ ) || \
-    (defined(__WATCOMC__) && __WATCOMC__ >= 1200)
+      (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
+    !defined(__DOS__)
 #    include "wx/msw/gccpriv.h"
 #else
 #    undef wxCHECK_W32API_VERSION
@@ -374,7 +375,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