using newer API

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 725e6a99cb419b7677d823aa752e92ca802f9f3a..324a77e876491f0a2616914585fd37aee9fd8420 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -72,6 +72,12 @@
 #endif
 
 #if defined(__PALMOS__)
+#   if __PALMOS__ == 0x06000000
+#       define __WXPALMOS6__
+#   endif
+#   if __PALMOS__ == 0x05000000
+#       define __WXPALMOS5__
+#   endif
 #   ifndef __WXPALMOS__
 #       define __WXPALMOS__
 #   endif
@@ -115,11 +121,6 @@
 
 #    ifndef __WIN32__
 #        define __WIN32__
-#    endif
-
-    /* this means Win95-style UI, i.e. Win9x/NT 4+: always true now */
-#    if !defined(__WIN95__)
-#        define __WIN95__
 #    endif
 #endif /* Win32 */
 
@@ -129,12 +130,6 @@
 #   endif
 #endif
 
-#ifdef __WINE__
-#   ifndef __WIN95__
-#       define __WIN95__
-#   endif
-#endif /* WINE */
-
 /* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )
 #   ifndef __SMARTPHONE__
@@ -180,6 +175,10 @@
 #   endif
 #endif
 
+#if defined(__POCKETPC__) || defined(__SMARTPHONE__) || defined(__WXGPE__)
+#   define __WXHANDHELD__
+#endif
+
 /*
    Include wx/setup.h for the Unix platform defines generated by configure and
    the library compilation options
@@ -246,7 +245,7 @@
 #endif /* wxUSE_UNICODE */
 
 #if defined( __MWERKS__ ) && !defined(__INTEL__)
-// otherwise MSL headers bring in WIN32 dependant APIs
+/* otherwise MSL headers bring in WIN32 dependant APIs */
 #undef UNICODE
 #endif
 
@@ -521,10 +520,13 @@
         ... 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) ) ) )
+#if defined(__GNUC__) && defined(__GNUC_MINOR__)
+    #define wxCHECK_GCC_VERSION( major, minor ) \
+        ( ( __GNUC__ > (major) ) \
+            || ( __GNUC__ == (major) && __GNUC_MINOR__ >= (minor) ) )
+#else
+    #define wxCHECK_GCC_VERSION( major, minor ) 0
+#endif
 
 /*
    This macro can be used to check that the version of mingw32 compiler is
@@ -552,8 +554,10 @@
 #endif
 
 #if defined (__WXMAC__)
-#    if !defined(WORDS_BIGENDIAN) && ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) )
+#    if ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) )
 #        define WORDS_BIGENDIAN 1
+#    else
+#        undef WORDS_BIGENDIAN
 #    endif
 #endif