disable use of #pragma interface under Mac OS X

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index ae2f01b8c633c5bf5eb76331d48e1bc3db035aa5..24d8e5a99f0d0174524accf2087c763da9a837c3 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -6,7 +6,7 @@
  * Created:     29.10.01 (extracted from wx/defs.h)
  * RCS-ID:      $Id$
  * Copyright:   (c) 1997-2001 wxWindows team
  * Created:     29.10.01 (extracted from wx/defs.h)
  * RCS-ID:      $Id$
  * Copyright:   (c) 1997-2001 wxWindows team

- * Licence:     wxWindows license
+ * Licence:     wxWindows licence

  */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */
  */
 
 /* THIS IS A C FILE, DON'T USE C++ FEATURES (IN PARTICULAR COMMENTS) IN IT */


@@ -14,11 +14,42 @@
 #ifndef _WX_PLATFORM_H_
 #define _WX_PLATFORM_H_
 
 #ifndef _WX_PLATFORM_H_
 #define _WX_PLATFORM_H_
 

+
+/*
+    Codewarrior doesn't define any Windows symbols until some headers
+    are included
+*/
+#if __MWERKS__
+    #include <stddef.h>
+    #if defined(WIN32) || defined(_WIN32)
+        #ifndef WINVER
+            #define WINVER  0x0400
+        #endif
+    #endif
+#endif
+
+

 /*
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
  */
 /*
    first define Windows symbols if they're not defined on the command line: we
    can autodetect everything we need if _WIN32 is defined
  */

-#if defined(_WIN32) || defined(WIN32) || defined(__NT__)
+#if defined(__CYGWIN32__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) \
+    && !defined(__WXX11__)
+    /* for Cygwin, default to wxMSW unless otherwise specified */
+    #ifndef __WXMSW__
+        #define __WXMSW__
+    #endif
+
+    #ifndef _WIN32
+        #define _WIN32
+    #endif
+
+    #ifndef WIN32
+        #define WIN32
+    #endif
+#endif
+
+#if defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)

     #ifndef __WXMSW__
         #define __WXMSW__
     #endif
     #ifndef __WXMSW__
         #define __WXMSW__
     #endif


@@ -39,16 +70,10 @@
     #endif
 #endif
 
     #endif
 #endif
 

-#ifdef __WXWINE__
-    #ifndef __WIN32__
-        #define __WIN32__
-    #endif
+#ifdef __WINE__

     #ifndef __WIN95__
         #define __WIN95__
     #endif
     #ifndef __WIN95__
         #define __WIN95__
     #endif

-    #ifndef STRICT
-        #define STRICT
-    #endif

 #endif /* WINE */
 
 #if defined(TWIN32) && !defined(__TWIN32__)
 #endif /* WINE */
 
 #if defined(TWIN32) && !defined(__TWIN32__)


@@ -137,7 +162,7 @@
         #define __HPUX__
     #endif /* HP-UX */
 
         #define __HPUX__
     #endif /* HP-UX */
 

-    #if defined(__CYGWIN__)
+    #if defined(__CYGWIN__) || defined(__WINE__)

         #if !defined(wxSIZE_T_IS_UINT)
             #define wxSIZE_T_IS_UINT
         #endif
         #if !defined(wxSIZE_T_IS_UINT)
             #define wxSIZE_T_IS_UINT
         #endif


@@ -146,14 +171,40 @@
       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
+    #ifndef TARGET_CARBON
+        #define TARGET_CARBON 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)

      */
 #elif defined(__OS2__)
     #if defined(__IBMCPP__)
      */
 #elif defined(__OS2__)
     #if defined(__IBMCPP__)


@@ -217,10 +268,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


@@ -232,5 +297,19 @@
     #define wxCHECK_W32API_VERSION(maj, min) (0)
 #endif
 
     #define wxCHECK_W32API_VERSION(maj, min) (0)
 #endif
 

+#ifdef __SC__
+    #ifdef __DMC__
+         #define __DIGITALMARS__
+    #else
+         #define __SYMANTEC__
+    #endif
+#endif
+
+#if defined (__WXMSW__)
+    #if !defined(__WATCOMC__)
+        #define wxHAVE_RAW_BITMAP
+    #endif
+#endif
+

 #endif /* _WX_PLATFORM_H_ */
 
 #endif /* _WX_PLATFORM_H_ */