Massive reworking of wxMediaCtrl code - backend everything, search for backends via...

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 6623815e5b495fad11d2cfc61dd6d51b0d24cb69..03ae2586795055cb41940436af69e0c4a9c9a409 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -24,29 +24,32 @@
 #endif
 
 /*
 #endif
 
 /*

-       WXMAC variants
-       __WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means
-       carbon API available (mach or cfm builds) , __WXMAC_OSX__ means mach-o
-       builds, running under 10.2 + only
+    WXMAC variants
+    __WXMAC_CLASSIC__ means ppc non-carbon builds, __WXMAC_CARBON__ means
+    carbon API available (mach or cfm builds) , __WXMAC_OSX__ means mach-o
+    builds, running under 10.2 + only

 */
 #ifdef __WXMAC__
 */
 #ifdef __WXMAC__

-       #if defined(__MACH__)
-               #define __WXMAC_OSX__ 1
-               #define __WXMAC_CARBON__ 1
-               #define __WXMAC_CLASSIC__ 0
-        #ifdef __WXMAC_XCODE__
-            #include "wx/mac/carbon/config_xcode.h"
-        #endif
-       #else
-               #define __WXMAC_OSX__ 0
-               #if TARGET_CARBON
-                       #define __WXMAC_CARBON__ 1
-                       #define __WXMAC_CLASSIC__ 0
-               #else
-                       #define __WXMAC_CARBON__ 0
-                       #define __WXMAC_CLASSIC__ 1
-               #endif
-       #endif
+#    if defined(__MACH__)
+#        define __WXMAC_OSX__
+#        define __WXMAC_CARBON__
+#        ifdef __WXMAC_XCODE__
+#            include "wx/mac/carbon/config_xcode.h"
+#        endif
+#    else
+#        if TARGET_CARBON
+#            define __WXMAC_CARBON__
+#        else
+#            define __WXMAC_CLASSIC__
+#        endif
+#    endif
+#endif
+
+/*
+    __WXOSX__ is a common define to wxMac (Carbon) and wxCocoa ports under OS X.
+ */
+#if defined(__WXMAC_OSX__) || defined(__WXCOCOA__)
+#   define __WXOSX__

 #endif
 
 /*
 #endif
 
 /*


@@ -117,6 +120,11 @@
                 with it, hence explicitly define a lower WINVER value for it.
              */
 #           define WINVER 0x0400
                 with it, hence explicitly define a lower WINVER value for it.
              */
 #           define WINVER 0x0400

+#       elif defined(__DMC__)
+            /*
+                Digital Mars is distributed with a little outdated headers.
+             */
+#           define WINVER 0x0400

 #       else /* !VC++ 6 */
             /*
                see MSDN for the description of possible WINVER values, this one
 #       else /* !VC++ 6 */
             /*
                see MSDN for the description of possible WINVER values, this one


@@ -138,36 +146,45 @@
 #endif /* Win32 */
 
 #if defined(__WXMSW__) || defined(__WIN32__)
 #endif /* Win32 */
 
 #if defined(__WXMSW__) || defined(__WIN32__)

-#    if !defined(__WINDOWS__)
-#        define __WINDOWS__
-#    endif
+#   if !defined(__WINDOWS__)
+#       define __WINDOWS__
+#   endif

 #endif
 
 #ifdef __WINE__
 #endif
 
 #ifdef __WINE__

-#    ifndef __WIN95__
-#        define __WIN95__
-#    endif
+#   ifndef __WIN95__
+#       define __WIN95__
+#   endif

 #endif /* WINE */
 
 #endif /* WINE */
 

-/* detect SmartPhone */
+/* detect MS SmartPhone */

 #if defined( WIN32_PLATFORM_WFSP )
 #if defined( WIN32_PLATFORM_WFSP )

-#    ifndef __SMARTPHONE__
-#        define __SMARTPHONE__
-#    endif
+#   ifndef __SMARTPHONE__
+#       define __SMARTPHONE__
+#   endif
+#   ifndef __WXWINCE__
+#       define __WXWINCE__
+#   endif

 #endif
 
 /* detect PocketPC */
 #if defined( WIN32_PLATFORM_PSPC )
 #endif
 
 /* detect PocketPC */
 #if defined( WIN32_PLATFORM_PSPC )

-#    ifndef __POCKETPC__
-#        define __POCKETPC__
-#    endif
+#   ifndef __POCKETPC__
+#       define __POCKETPC__
+#   endif
+#   ifndef __WXWINCE__
+#       define __WXWINCE__
+#   endif

 #endif
 
 /* detect Standard WinCE SDK */
 #if defined( WCE_PLATFORM_STANDARDSDK )
 #endif
 
 /* detect Standard WinCE SDK */
 #if defined( WCE_PLATFORM_STANDARDSDK )

-#    ifndef __WINCE_STANDARDSDK__
-#        define __WINCE_STANDARDSDK__
-#    endif
+#   ifndef __WINCE_STANDARDSDK__
+#       define __WINCE_STANDARDSDK__
+#   endif
+#   ifndef __WXWINCE__
+#       define __WXWINCE__
+#   endif

 #endif
 
 #if defined(_WIN32_WCE) && !defined(WIN32_PLATFORM_WFSP) && !defined(WIN32_PLATFORM_PSPC)
 #endif
 
 #if defined(_WIN32_WCE) && !defined(WIN32_PLATFORM_WFSP) && !defined(WIN32_PLATFORM_PSPC)


@@ -175,11 +192,14 @@
 #       ifndef __WINCE_NET__
 #           define __WINCE_NET__
 #       endif
 #       ifndef __WINCE_NET__
 #           define __WINCE_NET__
 #       endif

-#   elif (_WIN32_WCE >= 200) 
+#   elif (_WIN32_WCE >= 200)

 #       ifndef __HANDHELDPC__
 #           define __HANDHELDPC__
 #       endif
 #   endif
 #       ifndef __HANDHELDPC__
 #           define __HANDHELDPC__
 #       endif
 #   endif

+#   ifndef __WXWINCE__
+#       define __WXWINCE__
+#   endif

 #endif
 
 /*
 #endif
 
 /*


@@ -410,12 +430,6 @@
 #    define __UNIX__
 #endif /* Unix */
 
 #    define __UNIX__
 #endif /* Unix */
 

-#if defined(__HPUX__) && !defined(__WXGTK__)
-#    ifndef __WXMOTIF__
-#        define __WXMOTIF__
-#    endif /* __WXMOTIF__ */
-#endif
-

 #if defined(__WXMOTIF__) || defined(__WXX11__)
 #    define __X__
 #endif
 #if defined(__WXMOTIF__) || defined(__WXX11__)
 #    define __X__
 #endif


@@ -451,7 +465,9 @@
    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
  */

-#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
+#if defined(__PALMOS__)
+#    include "wx/palmos/gccpriv.h"
+#elif ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \

     defined( __CYGWIN__ ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
     defined( __CYGWIN__ ) || \
       (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
     !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)


@@ -507,5 +523,14 @@
 #    define wxUSE_WXDIB 1
 #endif
 
 #    define wxUSE_WXDIB 1
 #endif
 

+/*
+    We need AvailabilityMacros.h for ifdefing out things that don't exist on 
+    OSX 10.2 and lower
+    FIXME:  We need a better way to detect for 10.3 then including a system header
+*/
+#ifdef __DARWIN__
+    #include <AvailabilityMacros.h>
+#endif
+

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