X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03e11df5470fd64d9d9a669d0b50b84c2d714736..71d04f7ffdabd67233de114ae7b293501cdb3088:/include/wx/defs.h?ds=sidebyside

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 352820024a..aa702b207e 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -53,30 +53,42 @@
     #endif
 
     #if defined(__APPLE__)
-	// MacOS X
+        // MacOS X
         #ifndef __WXMAC__
             #define __WXMAC__
         #endif
         #ifndef __WXMAC_X__
+            // This define really should not be necessary since __WXMAC__
+            // combined with __UNIX__ is sufficient to differentiate
+            // Classic Mac OS from Mac OS X. However, some code has been
+            // added to workaround defects(?) in the bundled gcc compiler
+            // and these corrections are identified by __WXMAC_X__
             #define __WXMAC_X__
         #endif
-    
+
         #define PM_USE_SESSION_APIS 0
         #include <Carbon/Carbon.h>
     #endif
-#elif defined(applec) || defined(THINK_C) || (defined(__MWERKS__) && !defined(__INTEL__))
-        // MacOS
+#elif defined(applec) || \
+      defined(THINK_C) || \
+      (defined(__MWERKS__) && !defined(__INTEL__))
+      // MacOS
 #elif defined(__WXMAC__) && defined(__APPLE__)
-	// MacOS X
+    // MacOS X
     #define __UNIX_LIKE__
 
     #ifndef __WXMAC__
         #define __WXMAC__
     #endif
     #ifndef __WXMAC_X__
+        // This define really should not be necessary since __WXMAC__
+        // combined with __UNIX__ is sufficient to differentiate
+        // Classic Mac OS from Mac OS X. However, some code has been
+        // added to workaround defects(?) in the bundled gcc compiler
+        // and these corrections are identified by __WXMAC_X__
         #define __WXMAC_X__
     #endif
-    
+
     #define PM_USE_SESSION_APIS 0
     #include <Carbon/Carbon.h>
 #elif defined(__OS2__)
@@ -165,23 +177,11 @@
     #define va_list __gnuc_va_list
 #endif // HP-UX
 
-// Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which
-// are more ms-like (header author is Anders Norlander, hence the name)
-#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95)))
-    #ifndef wxUSE_NORLANDER_HEADERS
-        #define wxUSE_NORLANDER_HEADERS 1
-    #endif
+#if defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || defined( __CYGWIN__ )
+    #include "wx/msw/gccpriv.h"
 #else
-    #ifndef wxUSE_NORLANDER_HEADERS
-        #define wxUSE_NORLANDER_HEADERS 0
-    #endif
-#endif
-
-// "old" GNUWIN32 is the one without Norlander's headers: it lacks the
-// standard Win32 headers and we define the used stuff ourselves for it
-// in wx/msw/gnuwin32/extra.h
-#if defined(__GNUC__) && !wxUSE_NORLANDER_HEADERS
-    #define __GNUWIN32_OLD__
+    #undef wxCHECK_W32API_VERSION
+    #define wxCHECK_W32API_VERSION(maj, min) (0)
 #endif
 
 //////////////////////////////////////////////////////////////////////////////////