SetTextColour is gone

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 035b7e78ae0b92f21079ada59ba6a2b5b9a21f22..71790c352dddbbc6c2dde920434ae8e19b3fe411 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -19,7 +19,7 @@
     Codewarrior doesn't define any Windows symbols until some headers
     are included
 */
     Codewarrior doesn't define any Windows symbols until some headers
     are included
 */

-#if __MWERKS__
+#ifdef __MWERKS__

 #    include <stddef.h>
 #endif
 
 #    include <stddef.h>
 #endif
 


@@ -33,6 +33,13 @@
 #    if defined(__MACH__)
 #        define __WXMAC_OSX__
 #        define __WXMAC_CARBON__
 #    if defined(__MACH__)
 #        define __WXMAC_OSX__
 #        define __WXMAC_CARBON__

+#        include <AvailabilityMacros.h>
+#        ifndef MAC_OS_X_VERSION_10_4
+#           define MAC_OS_X_VERSION_10_4 1040
+#        endif
+#        ifndef MAC_OS_X_VERSION_10_5
+#           define MAC_OS_X_VERSION_10_5 1050
+#        endif

 #        ifdef __WXMAC_XCODE__
 #            include <unistd.h>
 #            include "wx/mac/carbon/config_xcode.h"
 #        ifdef __WXMAC_XCODE__
 #            include <unistd.h>
 #            include "wx/mac/carbon/config_xcode.h"


@@ -57,9 +64,7 @@
    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(__CYGWIN32__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) \
-    && !defined(__WXX11__)
-    /* for Cygwin, default to wxMSW unless otherwise specified */
+#if defined(__CYGWIN__) && defined(__WINDOWS__)

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


@@ -74,6 +79,12 @@
 #endif
 
 #if defined(__PALMOS__)
 #endif
 
 #if defined(__PALMOS__)

+#   if __PALMOS__ == 0x06000000
+#       define __WXPALMOS6__
+#   endif
+#   if __PALMOS__ == 0x05000000
+#       define __WXPALMOS5__
+#   endif

 #   ifndef __WXPALMOS__
 #       define __WXPALMOS__
 #   endif
 #   ifndef __WXPALMOS__
 #       define __WXPALMOS__
 #   endif


@@ -117,53 +128,6 @@
 
 #    ifndef __WIN32__
 #        define __WIN32__
 
 #    ifndef __WIN32__
 #        define __WIN32__

-#    endif
-
-    /*
-        The library user may override the default setting of WINVER by defining
-        it in his own makefile or project file -- if it is defined, we don't
-        touch it at all.
-
-        It makes sense to define WINVER as:
-            - either some lowish value (e.g. 0x0302) to not even compile in the
-              features not available in Windows version lower than some given
-              one
-            - or to a higher value than the one used by default for the given
-              compiler if you updated its headers to newer version of Platform
-              SDK, e.g. VC6 ships with 0x0400 headers by default but may also
-              work with 0x0500 headers and beyond
-    */
-#   ifndef WINVER
-#       if defined(_MSC_VER) && _MSC_VER < 1300
-            /*
-                VC6 defines some stuff in its default headers which is normally
-                only present if WINVER >= 0x0500 (FLASHW_XXX constants) which
-                means that our usual tests not involving WINVER sometimes fail
-                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
-               is the highest one defined right now (Windows Server 2003) and
-               we use it unless it was explicitly overridden by the user to
-               disable recent features support as we check for all of the
-               features we use which could be not available on earlier Windows
-               systems during run-time anyhow, so there is almost no
-               disadvantage in using it.
-             */
-#           define WINVER 0x0502
-#       endif /* VC++ 6/!VC++6 */
-#   endif
-
-    /* Win95 means Win95-style UI, i.e. Win9x/NT 4+ */
-#    if !defined(__WIN95__) && (WINVER >= 0x0400)
-#        define __WIN95__

 #    endif
 #endif /* Win32 */
 
 #    endif
 #endif /* Win32 */
 


@@ -173,12 +137,6 @@
 #   endif
 #endif
 
 #   endif
 #endif
 

-#ifdef __WINE__
-#   ifndef __WIN95__
-#       define __WIN95__
-#   endif
-#endif /* WINE */
-

 /* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )
 #   ifndef __SMARTPHONE__
 /* detect MS SmartPhone */
 #if defined( WIN32_PLATFORM_WFSP )
 #   ifndef __SMARTPHONE__


@@ -224,6 +182,19 @@
 #   endif
 #endif
 
 #   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
+
+   Note that it must be included before defining hardware symbols below as they
+   could be already defined by configure
+ */
+#include "wx/setup.h"
+

 /*
    Hardware platform detection.
 
 /*
    Hardware platform detection.
 


@@ -253,14 +224,6 @@
     #endif
 #endif /* alpha */
 
     #endif
 #endif /* alpha */
 

-/*
-   Include wx/setup.h for the Unix platform defines generated by configure and
-   the library compilation options
- */
-#include "wx/setup.h"
-
-/* check the consistency of the settings in setup.h */
-#include "wx/chkconf.h"

 
 /*
    adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1
 
 /*
    adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1


@@ -289,9 +252,33 @@
 #endif /* wxUSE_UNICODE */
 
 #if defined( __MWERKS__ ) && !defined(__INTEL__)
 #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
 #undef UNICODE
 #endif

+
+
+/*
+   This macro can be used to test the Open Watcom version.
+*/
+#ifndef __WATCOMC__
+#   define wxWATCOM_VERSION(major,minor) 0
+#   define wxCHECK_WATCOM_VERSION(major,minor) 0
+#   define wxONLY_WATCOM_EARLIER_THAN(major,minor) 0
+#elif defined(__WATCOMC__) && __WATCOMC__ < 1200
+#   error "Only Open Watcom is supported in this release"
+#else
+#   define wxWATCOM_VERSION(major,minor) ( major * 100 + minor * 10 + 1100 )
+#   define wxCHECK_WATCOM_VERSION(major,minor) ( __WATCOMC__ >= wxWATCOM_VERSION(major,minor) )
+#   define wxONLY_WATCOM_EARLIER_THAN(major,minor) ( __WATCOMC__ < wxWATCOM_VERSION(major,minor) )
+#endif
+
+/*
+   check the consistency of the settings in setup.h: note that this must be
+   done after setting wxUSE_UNICODE correctly as it is used in wx/chkconf.h
+ */
+#include "wx/chkconf.h"
+
+

 /*
    some compilers don't support iostream.h any longer, while some of theme
    are not updated with <iostream> yet, so override the users setting here
 /*
    some compilers don't support iostream.h any longer, while some of theme
    are not updated with <iostream> yet, so override the users setting here


@@ -363,6 +350,11 @@
              */
 #            define __SGI_CC__
 #        endif /* gcc/!gcc */
              */
 #            define __SGI_CC__
 #        endif /* gcc/!gcc */

+
+        /* system headers use this symbol and not __cplusplus in some places */
+#       ifndef _LANGUAGE_C_PLUS_PLUS
+#           define _LANGUAGE_C_PLUS_PLUS
+#       endif

 #    endif  /* SGI */
 
 #    if defined(sun) || defined(__SUN__)
 #    endif  /* SGI */
 
 #    if defined(sun) || defined(__SUN__)


@@ -427,14 +419,16 @@
        __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
      */
 #elif defined(__OS2__)
        __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
      */
 #elif defined(__OS2__)

+
+    /* wxOS2 vs. non wxOS2 ports on OS2 platform */
+#    if !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
+#        ifndef __WXPM__
+#            define __WXPM__
+#        endif
+#    endif
+

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

-#    endif
-#    ifndef __WXOS2__
-#        define __WXOS2__
-#    endif
-#    ifndef __WXPM__
-#        define __WXPM__

 #    endif
 
     /* Place other OS/2 compiler environment defines here */
 #    endif
 
     /* Place other OS/2 compiler environment defines here */


@@ -473,7 +467,7 @@
 #        define __VISUALC__ _MSC_VER
 #    elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
 #        define __BORLANDC__
 #        define __VISUALC__ _MSC_VER
 #    elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
 #        define __BORLANDC__

-#      elif defined(__WATCOMC__)
+#    elif defined(__WATCOMC__)

 #    elif defined(__SC__)
 #        define __SYMANTECC__
 #    endif  /* compiler */
 #    elif defined(__SC__)
 #        define __SYMANTECC__
 #    endif  /* compiler */


@@ -505,15 +499,23 @@
 #    endif
 #endif
 
 #    endif
 #endif
 

-/* Force linking against required libraries under Windows CE: */
-#ifdef __WXWINCE__
-#   include "wx/msw/wince/libraries.h"
+#ifdef __INTEL_COMPILER
+#   define __INTELC__
+#endif
+
+/*
+   We get "Large Files (ILP32) not supported in strict ANSI mode." #error
+   from HP-UX standard headers when compiling with g++ without this:
+ */
+#if defined(__HPUX__) && !defined(__STDC_EXT__)
+#   define __STDC_EXT__ 1

 #endif
 
 #endif
 

-/* Force inclusion of main PalmOS header: */
-#ifdef __WXPALMOS__
-#   include <PalmOS.h>
-#   undef Abs
+/* Force linking against required libraries under Windows: */
+#ifdef __WXWINCE__
+#   include "wx/msw/wince/libraries.h"
+#elif defined __WINDOWS__
+#   include "wx/msw/libraries.h"

 #endif
 
 /*
 #endif
 
 /*


@@ -525,19 +527,23 @@
         ... no gcc at all or gcc < 3.1 ...
 #    endif
 */
         ... 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
    at least maj.min
  */
 #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
 
 /*
    This macro can be used to check that the version of mingw32 compiler is
    at least maj.min
  */
 #if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \

-    defined( __CYGWIN__ ) || \
-      (defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
+    ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
+      wxCHECK_WATCOM_VERSION(1,0) ) && \

     !defined(__DOS__) && \
     !defined(__DOS__) && \

+    !defined(__WXPM__) && \

     !defined(__WXMOTIF__) && \
     !defined(__WXGTK__) && \
     !defined(__WXX11__) && \
     !defined(__WXMOTIF__) && \
     !defined(__WXGTK__) && \
     !defined(__WXX11__) && \


@@ -555,8 +561,10 @@
 #endif
 
 #if defined (__WXMAC__)
 #endif
 
 #if defined (__WXMAC__)

-#    ifndef WORDS_BIGENDIAN
+#    if ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) )

 #        define WORDS_BIGENDIAN 1
 #        define WORDS_BIGENDIAN 1

+#    else
+#        undef WORDS_BIGENDIAN

 #    endif
 #endif
 
 #    endif
 #endif
 


@@ -604,4 +612,3 @@
 #endif
 
 #endif /* _WX_PLATFORM_H_ */
 #endif
 
 #endif /* _WX_PLATFORM_H_ */

-