wxX11:

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 6ede4d027832cb021c44cfb4dd9ee231e96ace6a..d728ebf0ee1277c423f44f17aa3473a86d0e4068 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -78,13 +78,32 @@
 #endif
 
 /*
-   OS: first test for generic Unix defines, then for particular flavours and
+   OS: first of all, test for MS-DOS platform. We must do this before testing
+       for Unix, because DJGPP compiler defines __unix__ under MS-DOS
+ */
+#if defined(__GO32__) || defined(__DJGPP__) || defined(__DOS__)
+    #ifndef __DOS__
+        #define __DOS__
+    #endif
+    /* size_t is the same as unsigned int for Watcom 11 compiler, */
+    /* so define it if it hadn't been done by configure yet */
+    #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+        #ifdef __WATCOMC__
+            #define wxSIZE_T_IS_UINT
+        #endif
+        #ifdef __DJGPP__
+            #define wxSIZE_T_IS_ULONG
+        #endif
+    #endif
+
+/*
+   OS: then test for generic Unix defines, then for particular flavours and
        finally for Unix-like systems
  */
-#if defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
-    defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \
-    defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
-    defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
+#elif defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
+      defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \
+      defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
+      defined(__EMX__) || defined(__VMS) || defined(__BEOS__)
 
     #define __UNIX_LIKE__
 
@@ -118,18 +137,6 @@
         #define __HPUX__
     #endif /* HP-UX */
 
-    #if defined(__WXMAC__) && defined(__DARWIN__)
-        /* Mac OS X */
-
-        /*
-           Some code has been added to workaround defects(?) in the
-           bundled gcc compiler. These corrections are identified by:
-           __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif)
-         */
-
-        #include <Carbon/Carbon.h>
-    #endif /* __WXMAC__ && __DARWIN__ */
-
     #if defined(__CYGWIN__)
         #if !defined(wxSIZE_T_IS_UINT)
             #define wxSIZE_T_IS_UINT
@@ -148,8 +155,6 @@
        bundled gcc compiler. These corrections are identified by:
        __DARWIN__ for corrections necessary for Darwin (wxMac, wxMotif)
      */
-
-    #include <Carbon/Carbon.h>
 #elif defined(__OS2__)
     #if defined(__IBMCPP__)
         #define __VISAGEAVER__ __IBMCPP__
@@ -168,12 +173,6 @@
     #endif
     #define wxSIZE_T_IS_UINT
 
-#elif defined(__DOS__)
-    /* size_t is the same as unsigned int for Watcom 11 compiler, */
-    /* so define it if it hadn't been done by configure yet */
-    #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
-        #define wxSIZE_T_IS_UINT
-    #endif
 #else   /* Windows */
     #ifndef __WINDOWS__
         #define __WINDOWS__
@@ -218,7 +217,7 @@
     #endif /* __WXMOTIF__ */
 #endif
 
-#if defined(__WXMOTIF__)
+#if defined(__WXMOTIF__) || defined(__WXX11__)
     #define __X__
 #endif