use "..." for wx includes instead of <...>

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index b0443cb2b2e1fe98c3b423da695ebf43e91f3f49..60c5770ed0dbac6f7f337969a720267fb6163b73 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -78,13 +78,32 @@
 #endif
 
 /*
 #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
  */
        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__
 
 
     #define __UNIX_LIKE__
 


@@ -118,18 +137,6 @@
         #define __HPUX__
     #endif /* HP-UX */
 
         #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
     #if defined(__CYGWIN__)
         #if !defined(wxSIZE_T_IS_UINT)
             #define wxSIZE_T_IS_UINT


@@ -139,17 +146,38 @@
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
       /* MacOS */
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
       /* MacOS */

-#elif defined(__WXMAC__) && defined(__DARWIN__)
+    #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+        #define wxSIZE_T_IS_ULONG
+    #endif
+#elif defined(__WXMAC__) && defined(__APPLE__)

     /* Mac OS X */
     #define __UNIX_LIKE__
 
     /* Mac OS X */
     #define __UNIX_LIKE__
 

+    /*
+      These defines are needed when compiling using Project Builder
+      with a non generated setup0.h
+    */
+    #ifndef __UNIX__
+        #define __UNIX__ 1
+    #endif
+    #ifndef __BSD__
+        #define __BSD__ 1
+    #endif
+    #ifndef __DARWIN__
+        #define __DARWIN__ 1
+    #endif
+    #ifndef __POWERPC__
+        #define __POWERPC__ 1
+    #endif
+
+    #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+        #define wxSIZE_T_IS_ULONG
+    #endif

     /*
        Some code has been added to workaround defects(?) in the
     /*
        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)
+       bundled gcc compiler. These corrections are identified by
+       __DARWIN__ for Darwin related corrections (wxMac, wxMotif)

      */
      */

-
-    #include <Carbon/Carbon.h>

 #elif defined(__OS2__)
     #if defined(__IBMCPP__)
         #define __VISAGEAVER__ __IBMCPP__
 #elif defined(__OS2__)
     #if defined(__IBMCPP__)
         #define __VISAGEAVER__ __IBMCPP__


@@ -167,6 +195,7 @@
         #define LINKAGEMODE _Optlink
     #endif
     #define wxSIZE_T_IS_UINT
         #define LINKAGEMODE _Optlink
     #endif
     #define wxSIZE_T_IS_UINT

+

 #else   /* Windows */
     #ifndef __WINDOWS__
         #define __WINDOWS__
 #else   /* Windows */
     #ifndef __WINDOWS__
         #define __WINDOWS__


@@ -211,10 +240,24 @@
     #endif /* __WXMOTIF__ */
 #endif
 
     #endif /* __WXMOTIF__ */
 #endif
 

-#if defined(__WXMOTIF__)
+#if defined(__WXMOTIF__) || defined(__WXX11__)

     #define __X__
 #endif
 
     #define __X__
 #endif
 

+/*
+   This macro can be used to test the gcc version and can be used like this:
+
+    #if wxCHECK_GCC_VERSION(3, 1)
+        ... we have gcc 3.1 or later ...
+    #else
+        ... no gcc at all or gcc < 3.1 ...
+    #endif
+*/
+#define wxCHECK_GCC_VERSION( major, minor ) \
+    ( defined(__GNUC__) && defined(__GNUC_MINOR__) \
+    && ( ( __GNUC__ > (major) ) \
+        || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) ) )
+

 /*
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
 /*
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min