Remove unnecessary Mac-specific TOOLKIT_LOWERCASE setting.

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

diff --git a/include/wx/platform.h b/include/wx/platform.h
index 3a761c91f3dd6af4965faeb259d003b30c141a18..33770bcb4293744cf0b5c1dcd05ecb6f84733250 100644 (file)
--- a/include/wx/platform.h
+++ b/include/wx/platform.h
@@ -1,13 +1,13 @@
-/*
- * Name:        wx/platform.h
- * Purpose:     define the OS and compiler identification macros
- * Author:      Vadim Zeitlin
- * Modified by:
- * Created:     29.10.01 (extracted from wx/defs.h)
- * RCS-ID:      $Id$
- * Copyright:   (c) 1997-2001 wxWindows team
- * Licence:     wxWindows licence
- */
+/**
+* Name:        wx/platform.h
+* Purpose:     define the OS and compiler identification macros
+* Author:      Vadim Zeitlin
+* Modified by:
+* Created:     29.10.01 (extracted from wx/defs.h)
+* RCS-ID:      $Id$
+* Copyright:   (c) 1997-2001 Vadim Zeitlin
+* 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 */
 


@@ -19,95 +19,346 @@
     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__
-    #include <stddef.h>
+#ifdef __MWERKS__
+#   include <stddef.h>
+
+#  if !defined(__WXMAC__) && !defined(__WINDOWS__) && !defined(WIN32) && !defined(_WIN32_WCE)
+#    define __PALMOS__ 0x05000000
+#  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
+    WXOSX targets
+    __WXOSX_MAC__ means Mac OS X, non embedded
+    __WXOSX_IPHONE__ means OS X iPhone
+*/
+
+/*
+    Normally all of __WXOSX_XXX__, __WXOSX__ and __WXMAC__ are defined by
+    configure but ensure that we also define them if configure was not used for
+    whatever reason.
+
+    The primare symbol remains __WXOSX_XXX__ one, __WXOSX__ exists to allow
+    checking for any OS X port (Carbon and Cocoa) and __WXMAC__ is an old name
+    for it.

  */
  */

-#if defined(__CYGWIN32__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) \
-    && !defined(__WXX11__)
-    /* for Cygwin, default to wxMSW unless otherwise specified */
-    #ifndef __WXMSW__
-        #define __WXMSW__
-    #endif
+#if defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__) || defined(__WXOSX_IPHONE__)
+#   ifndef __WXOSX__
+#       define __WXOSX__ 1
+#   endif
+#   ifndef __WXMAC__
+#       define __WXMAC__ 1
+#   endif
+#endif

 
 

-    #ifndef _WIN32
-        #define _WIN32
-    #endif
+#ifdef __WXOSX__
+/* setup precise defines according to sdk used */
+#   include <TargetConditionals.h>
+#   if defined(__WXOSX_IPHONE__)
+#       if !( defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE )
+#           error "incorrect SDK for an iPhone build"
+#       endif
+#   elif defined(__WXOSX_CARBON__) || defined(__WXOSX_COCOA__)
+#       if !( defined(TARGET_OS_MAC) && TARGET_OS_MAC )
+#           error "incorrect SDK for a Mac OS X build"
+#       endif
+#       define __WXOSX_MAC__ 1
+#   else
+#       error "one of __WXOSX_IPHONE__, __WXOSX_CARBON__ or __WXOSX_COCOA__ must be defined"
+#   endif
+#endif

 
 

-    #ifndef WIN32
-        #define WIN32
-    #endif
+#ifdef __WXOSX_MAC__
+#    if defined(__MACH__)
+#        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
+#        ifndef MAC_OS_X_VERSION_10_6
+#           define MAC_OS_X_VERSION_10_6 1060
+#        endif
+#    else
+#        error "only mach-o configurations are supported"
+#    endif

 #endif
 
 #endif
 

-#if defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)
-    #ifndef __WXMSW__
-        #define __WXMSW__
-    #endif
+/*
+    __WXOSX_OR_COCOA__ is a common define to wxOSX (Carbon or Cocoa) and wxCocoa ports under OS X.

 
 

-    #ifndef __WIN32__
-        #define __WIN32__
-    #endif
+    DO NOT use this define in base library code.  Although wxMac has its own
+    private base library (and thus __WXOSX_OR_COCOA__,__WXMAC__ and related defines are
+    valid there), wxCocoa shares its library with other ports like wxGTK and wxX11.

 
 

-    /*
-       see MSDN for the description of possible WINVER values, this one is a
-       good default and, anyhow, we check for most of the features we use
-       during run-time.
-     */
-    #ifndef WINVER
-        #define WINVER  0x0400
-    #endif
+    To keep wx authors from screwing this up, only enable __WXOSX_OR_COCOA__ for wxCocoa when
+    not compiling the base library.  We determine this by first checking if
+    wxUSE_BASE is not defined.  If it is not defined, then we're not buildling
+    the base library, and possibly not building wx at all (but actually building
+    user code that's using wx). If it is defined then we must check to make sure
+    it is not true.  If it is true, we're building base.

 
 

-    /* Win95 means Win95-style UI, i.e. Win9x/NT 4+ */
-    #if !defined(__WIN95__) && (WINVER >= 0x0400)
-        #define __WIN95__
-    #endif
+    If you want it in the common darwin base library then use __DARWIN__.  You
+    can use any Darwin-available libraries like CoreFoundation but please avoid
+    using OS X libraries like Carbon or CoreServices.
+
+ */
+#if defined(__WXOSX__) || (defined(__WXCOCOA__) && (!defined(wxUSE_BASE) || !wxUSE_BASE))
+#   define __WXOSX_OR_COCOA__ 1
+#endif
+
+#ifdef __WXOSX_OR_COCOA__
+#    ifdef __WXMAC_XCODE__
+#        include <unistd.h>
+#        include <TargetConditionals.h>
+#        include <AvailabilityMacros.h>
+#        include "wx/osx/config_xcode.h"
+#    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
+ */
+#if defined(__CYGWIN__) && defined(__WINDOWS__)
+#    ifndef __WXMSW__
+#        define __WXMSW__
+#    endif
+#endif
+
+#if defined(__PALMOS__)
+#   if __PALMOS__ == 0x06000000
+#       define __WXPALMOS6__ 1
+#   endif
+#   if __PALMOS__ == 0x05000000
+#       define __WXPALMOS5__ 1
+#   endif
+#   ifndef __WXPALMOS__
+#       define __WXPALMOS__ 1
+#   endif
+#   ifdef __WXMSW__
+#       undef __WXMSW__
+#   endif
+#   ifdef __WINDOWS__
+#       undef __WINDOWS__
+#   endif
+#   ifdef __WIN32__
+#       undef __WIN32__
+#   endif
+#   ifdef WIN32
+#       undef WIN32
+#   endif
+#   ifdef _WIN32
+#       undef _WIN32
+#   endif
+#endif
+
+#if defined(_WIN64)
+#    ifndef _WIN32
+        /*
+            a lot of code (mistakenly) uses #ifdef _WIN32 to either test for
+            Windows or to test for !__WIN16__, so we must define _WIN32 for
+            Win64 as well to ensure that the existing code continues to work.
+         */
+#       define _WIN32
+#   endif /* !_WIN32 */
+
+#   ifndef __WIN64__
+#       define __WIN64__
+#   endif /* !__WIN64__ */
+#endif /* _WIN64 */
+
+#if (defined(_WIN32) || defined(WIN32) || defined(__NT__) || defined(__WXWINCE__)) \
+    && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
+#    ifndef __WXMSW__
+#        define __WXMSW__
+#    endif

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

-#if defined(__WXMSW__) || defined(__WIN32__)
-    #if !defined(__WINDOWS__)
-        #define __WINDOWS__
-    #endif
+#if defined(__WXMSW__)
+#   if !defined(__WINDOWS__)
+#       define __WINDOWS__
+#   endif
+
+#   ifndef _WIN32
+#        define _WIN32
+#   endif
+
+#   ifndef WIN32
+#        define WIN32
+#   endif
+
+#   ifndef __WIN32__
+#        define __WIN32__
+#   endif
+#endif /* __WXMSW__ */
+
+/* detect MS SmartPhone */
+#if defined( WIN32_PLATFORM_WFSP )
+#   ifndef __SMARTPHONE__
+#       define __SMARTPHONE__
+#   endif
+#   ifndef __WXWINCE__
+#       define __WXWINCE__
+#   endif

 #endif
 
 #endif
 

-#ifdef __WINE__
-    #ifndef __WIN95__
-        #define __WIN95__
-    #endif
-#endif /* WINE */
+/* detect PocketPC */
+#if defined( WIN32_PLATFORM_PSPC )
+#   ifndef __POCKETPC__
+#       define __POCKETPC__
+#   endif
+#   ifndef __WXWINCE__
+#       define __WXWINCE__
+#   endif
+#endif
+
+/* detect Standard WinCE SDK */
+#if defined( WCE_PLATFORM_STANDARDSDK )
+#   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)
+#   if (_WIN32_WCE >= 400)
+#       ifndef __WINCE_NET__
+#           define __WINCE_NET__
+#       endif
+#   elif (_WIN32_WCE >= 200)
+#       ifndef __HANDHELDPC__
+#           define __HANDHELDPC__
+#       endif
+#   endif
+#   ifndef __WXWINCE__
+#       define __WXWINCE__
+#   endif
+#endif
+
+#if defined(__WXWINCE__) && defined(_MSC_VER) && (_MSC_VER == 1201)
+    #define __EVC4__
+#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
 
 /*
    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"
 
  */
 #include "wx/setup.h"
 

-/* check the consistency of the settings in setup.h */
-#include "wx/chkconf.h"
+#ifdef __GCCXML__
+    /*
+        we're using gccxml to create an XML representation of the entire
+        wxWidgets interface; use a special setup_gccxml.h file to fix some
+        of the stuff #defined by the real setup.h
+    */
+    #include "wx/setup_gccxml.h"
+#endif
+

 
 /*
 
 /*

-   some compilers don't support iostream.h any longer, so override the users
-   setting here in such case.
+   Hardware platform detection.
+
+   VC++ defines _M_xxx symbols.

  */
  */

-#if defined(_MSC_VER) && (_MSC_VER >= 1310)
-    #undef wxUSE_IOSTREAMH
-    #define wxUSE_IOSTREAMH 0
-#endif /* compilers not supporting iostream.h */
+#if defined(_M_IX86) || defined(i386) || defined(__i386) || defined(__i386__)
+    #ifndef __INTEL__
+        #define __INTEL__
+    #endif
+#endif /* x86 */

 
 

-/*
-   old C++ headers (like <iostream.h>) declare classes in the global namespace
-   while the new, standard ones (like <iostream>) do it in std:: namespace
+#if defined(_M_IA64)
+    #ifndef __IA64__
+        #define __IA64__
+    #endif
+#endif /* ia64 */

 
 

-   using this macro allows constuctions like "wxSTD iostream" to work in
-   either case
+#if defined(_M_MPPC) || defined(__PPC__) || defined(__ppc__)
+    #ifndef __POWERPC__
+        #define __POWERPC__
+    #endif
+#endif /* alpha */
+
+#if defined(_M_ALPHA) || defined(__AXP__)
+    #ifndef __ALPHA__
+        #define __ALPHA__
+    #endif
+#endif /* alpha */
+
+
+/*
+   adjust the Unicode setting: wxUSE_UNICODE should be defined as 0 or 1
+   and is used by wxWidgets, _UNICODE and/or UNICODE may be defined or used by
+   the system headers so bring these settings in sync

  */
  */

-#if !wxUSE_IOSTREAMH
-    #define wxSTD std::
+
+/* set wxUSE_UNICODE to 1 if UNICODE or _UNICODE is defined */
+#if defined(_UNICODE) || defined(UNICODE)
+#   undef wxUSE_UNICODE
+#   define wxUSE_UNICODE 1
+#else /* !UNICODE */
+#   ifndef wxUSE_UNICODE
+#       define wxUSE_UNICODE 0
+#   endif
+#endif /* UNICODE/!UNICODE */
+
+/* and vice versa: define UNICODE and _UNICODE if wxUSE_UNICODE is 1 */
+#if wxUSE_UNICODE
+#   ifndef _UNICODE
+#       define _UNICODE
+#   endif
+#   ifndef UNICODE
+#       define UNICODE
+#   endif
+#endif /* wxUSE_UNICODE */
+
+#if defined( __MWERKS__ ) && !defined(__INTEL__)
+/* otherwise MSL headers bring in WIN32 dependant APIs */
+#undef UNICODE
+#endif
+
+
+/*
+   test for old versions of Borland C, normally need at least 5.82, Turbo
+   explorer, available for free at http://www.turboexplorer.com/downloads
+*/
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x550)
+#   error "wxWidgets requires a newer version of Borland, we recommend upgrading to 5.82 (Turbo Explorer). You may at your own risk remove this line and try building but be prepared to get build errors."
+#endif /* __BORLANDC__ */
+
+#if defined(__BORLANDC__) && (__BORLANDC__ < 0x582) && (__BORLANDC__ > 0x559)
+#   ifndef _USE_OLD_RW_STL
+#       error "wxWidgets is incompatible with default Borland C++ 5.6 STL library, please add -D_USE_OLD_RW_STL to your bcc32.cfg to use RogueWave STL implementation."
+#   endif
+#endif /* __BORLANDC__ */
+
+
+/*
+   Define Watcom-specific macros.
+*/
+#ifndef __WATCOMC__
+#   define wxWATCOM_VERSION(major,minor) 0
+#   define wxCHECK_WATCOM_VERSION(major,minor) 0
+#   define wxONLY_WATCOM_EARLIER_THAN(major,minor) 0
+#   define WX_WATCOM_ONLY_CODE( x )

 #else
 #else

-    #define wxSTD
+#   if __WATCOMC__ < 1200
+#       error "Only Open Watcom is supported in this release"
+#   endif
+
+#   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) )
+#   define WX_WATCOM_ONLY_CODE( x )  x

 #endif
 
 /*
 #endif
 
 /*


@@ -115,151 +366,202 @@
        for Unix, because DJGPP compiler defines __unix__ under MS-DOS
  */
 #if defined(__GO32__) || defined(__DJGPP__) || defined(__DOS__)
        for Unix, because DJGPP compiler defines __unix__ under MS-DOS
  */
 #if defined(__GO32__) || defined(__DJGPP__) || defined(__DOS__)

-    #ifndef __DOS__
-        #define __DOS__
-    #endif
+#    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 */
     /* 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
+#    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
 
 /*
    OS: then test for generic Unix defines, then for particular flavours and
        finally for Unix-like systems

+       Mac OS X matches this case (__MACH__), prior Mac OS do not.

  */
 #elif defined(__UNIX__) || defined(__unix) || defined(__unix__) || \
       defined(____SVR4____) || defined(__LINUX__) || defined(__sgi) || \
       defined(__hpux) || defined(sun) || defined(__SUN__) || defined(_AIX) || \
  */
 #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__)
+      defined(__EMX__) || defined(__VMS) || defined(__BEOS__) || defined(__MACH__)

 
 

-    #define __UNIX_LIKE__
+#    define __UNIX_LIKE__

 
     /* Helps SGI compilation, apparently */
 
     /* Helps SGI compilation, apparently */

-    #ifdef __SGI__
-        #ifdef __GNUG__
-            #define __need_wchar_t
-        #else /* !gcc */
+#    ifdef __SGI__
+#        ifdef __GNUG__
+#            define __need_wchar_t
+#        else /* !gcc */

             /*
                Note I use the term __SGI_CC__ for both cc and CC, its not a good
                idea to mix gcc and cc/CC, the name mangling is different
              */
             /*
                Note I use the term __SGI_CC__ for both cc and CC, its not a good
                idea to mix gcc and cc/CC, the name mangling is different
              */

-            #define __SGI_CC__
-        #endif /* gcc/!gcc */
-    #endif  /* SGI */
-
-    #if defined(sun) || defined(__SUN__)
-        #ifndef __GNUG__
-            #ifndef __SUNCC__
-                #define __SUNCC__
-            #endif /* Sun CC */
-        #endif
-    #endif /* Sun */
-
-    #ifdef __EMX__
-        #define OS2EMX_PLAIN_CHAR
-    #endif
+#            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(__SUNPRO_CC)
+#       ifndef __SUNCC__
+#           define __SUNCC__ __SUNPRO_CC
+#       endif /* Sun CC */
+#    endif /* Sun CC */
+
+#    ifdef __EMX__
+#        define OS2EMX_PLAIN_CHAR
+#    endif
+#    if defined(__INNOTEK_LIBC__)
+        /* Ensure visibility of strnlen declaration */
+#        define _GNU_SOURCE
+#    endif

 
     /* define __HPUX__ for HP-UX where standard macro is __hpux */
 
     /* define __HPUX__ for HP-UX where standard macro is __hpux */

-    #if defined(__hpux) && !defined(__HPUX__)
-        #define __HPUX__
-    #endif /* HP-UX */
-
-    #if defined(__CYGWIN__) || defined(__WINE__)
-        #if !defined(wxSIZE_T_IS_UINT)
-            #define wxSIZE_T_IS_UINT
-        #endif
-    #endif
+#    if defined(__hpux) && !defined(__HPUX__)
+#        define __HPUX__
+#    endif /* HP-UX */
+
+#    if defined(__CYGWIN__) || defined(__WINE__)
+#        if !defined(wxSIZE_T_IS_UINT)
+#            define wxSIZE_T_IS_UINT
+#        endif
+#    endif
+
+    /*  All of these should already be defined by including configure-
+        generated setup.h but we wish to support Xcode compilation without
+        requiring the user to define these himself.
+     */
+#    if defined(__APPLE__) && defined(__MACH__)
+#        ifndef __UNIX__
+#            define __UNIX__ 1
+#        endif
+#        ifndef __BSD__
+#            define __BSD__ 1
+#        endif
+        /*  __DARWIN__ is our own define to mean OS X or pure Darwin */
+#        ifndef __DARWIN__
+#            define __DARWIN__ 1
+#        endif
+        /*  NOTE: TARGET_CARBON is actually a 0/1 and must be 1 for OS X */
+#        ifndef TARGET_CARBON
+#            define TARGET_CARBON 1
+#        endif
+        /* OS X uses unsigned long size_t for both ILP32 and LP64 modes. */
+#        if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+#            define wxSIZE_T_IS_ULONG
+#        endif
+#    endif
+
+/*
+   OS: Classic Mac OS
+ */

 #elif defined(applec) || \
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
       /* MacOS */
 #elif defined(applec) || \
       defined(THINK_C) || \
       (defined(__MWERKS__) && !defined(__INTEL__))
       /* MacOS */

-    #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__
+#    if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
+#        define wxSIZE_T_IS_ULONG
+#    endif

 
 

-    /*
-      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
-       bundled gcc compiler. These corrections are identified by
-       __DARWIN__ for Darwin related corrections (wxMac, wxMotif)
-     */
+/*
+   OS: OS/2
+ */

 #elif defined(__OS2__)
 #elif defined(__OS2__)

-    #if defined(__IBMCPP__)
-        #define __VISAGEAVER__ __IBMCPP__
-    #endif
-    #ifndef __WXOS2__
-        #define __WXOS2__
-    #endif
-    #ifndef __WXPM__
-        #define __WXPM__
-    #endif
+
+    /* 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__
+#    endif

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

-    #if defined(__VISAGECPP__)
+#    if defined(__VISAGECPP__)

         /* VisualAge is the only thing that understands _Optlink */
         /* VisualAge is the only thing that understands _Optlink */

-        #define LINKAGEMODE _Optlink
-    #endif
-    #define wxSIZE_T_IS_UINT
+#        define LINKAGEMODE _Optlink
+#    endif
+#    define wxSIZE_T_IS_UINT
+
+/*
+   OS: Palm OS
+ */
+#elif defined(__PALMOS__)
+#    ifdef __WIN32__
+#        error "__WIN32__ should not be defined for PalmOS"
+#    endif
+#    ifdef __WINDOWS__
+#        error "__WINDOWS__ should not be defined for PalmOS"
+#    endif
+#    ifdef __WXMSW__
+#        error "__WXMSW__ should not be defined for PalmOS"
+#    endif

 
 

+/*
+   OS: Otherwise it must be Windows
+ */

 #else   /* Windows */
 #else   /* Windows */

-    #ifndef __WINDOWS__
-        #define __WINDOWS__
-    #endif  /* Windows */
+#    ifndef __WINDOWS__
+#        define __WINDOWS__
+#    endif  /* Windows */

 
     /* to be changed for Win64! */
 
     /* to be changed for Win64! */

-    #ifndef __WIN32__
-        #define __WIN16__
-    #endif
+#    ifndef __WIN32__
+#        error "__WIN32__ should be defined for Win32 and Win64, Win16 is not supported"
+#    endif

 
     /*
        define another standard symbol for Microsoft Visual C++: the standard
        one (_MSC_VER) is also defined by Metrowerks compiler
      */
 
     /*
        define another standard symbol for Microsoft Visual C++: the standard
        one (_MSC_VER) is also defined by Metrowerks compiler
      */

-    #if defined(_MSC_VER) && !defined(__MWERKS__)
-        #define __VISUALC__ _MSC_VER
-    #elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
-        #define __BORLANDC__
-      #elif defined(__WATCOMC__)
-    #elif defined(__SC__)
-        #define __SYMANTECC__
-    #endif  /* compiler */
+#    if defined(_MSC_VER) && !defined(__MWERKS__)
+#        define __VISUALC__ _MSC_VER
+
+    /*
+       define special symbols for different VC version instead of writing tests
+       for magic numbers such as 1200, 1300 &c repeatedly
+     */
+#   if __VISUALC__ < 1100
+#       error "This Visual C++ version is too old and not supported any longer."
+#   elif __VISUALC__ < 1200
+#       define __VISUALC5__
+#   elif __VISUALC__ < 1300
+#       define __VISUALC6__
+#   elif __VISUALC__ < 1400
+#       define __VISUALC7__
+#   elif __VISUALC__ < 1500
+#       define __VISUALC8__
+#   elif __VISUALC__ < 1600
+#       define __VISUALC9__
+#   elif __VISUALC__ < 1700
+#       define __VISUALC10__
+#   else
+#       pragma message("Please update wx/platform.h to recognize this VC++ version")
+#   endif
+
+#    elif defined(__BCPLUSPLUS__) && !defined(__BORLANDC__)
+#        define __BORLANDC__
+#    elif defined(__WATCOMC__)
+#    elif defined(__SC__)
+#        define __SYMANTECC__
+#    endif  /* compiler */

 
     /* size_t is the same as unsigned int for all Windows compilers we know, */
     /* so define it if it hadn't been done by configure yet */
 
     /* size_t is the same as unsigned int for all Windows compilers we know, */
     /* so define it if it hadn't been done by configure yet */

-    #if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG)
-        #define wxSIZE_T_IS_UINT
-    #endif
+#    if !defined(wxSIZE_T_IS_UINT) && !defined(wxSIZE_T_IS_ULONG) && !defined(__WIN64__)
+#        define wxSIZE_T_IS_UINT
+#    endif

 #endif  /* OS */
 
 /*
 #endif  /* OS */
 
 /*


@@ -267,64 +569,192 @@
    define __UNIX__), do define __UNIX__ now
  */
 #if !defined(__UNIX__) && defined(__UNIX_LIKE__)
    define __UNIX__), do define __UNIX__ now
  */
 #if !defined(__UNIX__) && defined(__UNIX_LIKE__)

-    #define __UNIX__
+#    define __UNIX__

 #endif /* Unix */
 
 #endif /* Unix */
 

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

 #endif
 
 #endif
 

-#if defined(__WXMOTIF__) || defined(__WXX11__)
-    #define __X__
+#ifdef __SC__
+#    ifdef __DMC__
+#         define __DIGITALMARS__
+#    else
+#         define __SYMANTEC__
+#    endif
+#endif
+
+#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
+
+/* Force linking against required libraries under Windows: */
+#ifdef __WXWINCE__
+#   include "wx/msw/wince/libraries.h"
+#elif defined __WINDOWS__
+#   include "wx/msw/libraries.h"

 #endif
 
 /*
    This macro can be used to test the gcc version and can be used like this:
 
 #endif
 
 /*
    This macro can be used to test the gcc version and can be used like this:
 

-    #if wxCHECK_GCC_VERSION(3, 1)
+#    if wxCHECK_GCC_VERSION(3, 1)

         ... we have gcc 3.1 or later ...
         ... we have gcc 3.1 or later ...

-    #else
+#    else

         ... no gcc at all or gcc < 3.1 ...
         ... no gcc at all or gcc < 3.1 ...

-    #endif
+#    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
+
+#if defined(__BORLANDC__) || (defined(__GNUC__) && __GNUC__ < 3)
+#define wxNEEDS_CHARPP
+#endif
+
+/*
+   This macro can be used to test the Visual C++ version.
+*/
+#ifndef __VISUALC__
+#   define wxVISUALC_VERSION(major) 0
+#   define wxCHECK_VISUALC_VERSION(major) 0
+#else
+#   define wxVISUALC_VERSION(major) ( (6 + major) * 100 )
+#   define wxCHECK_VISUALC_VERSION(major) ( __VISUALC__ >= wxVISUALC_VERSION(major) )
+#endif

 
 /*
    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__ ) || \
-    defined( __CYGWIN__ ) || \
-    (defined(__WATCOMC__) && __WATCOMC__ >= 1200) || defined(__DIGITALMARS__)
-    #include "wx/msw/gccpriv.h"
+#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
+    ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
+      wxCHECK_WATCOM_VERSION(1,0) ) && \
+    !defined(__DOS__) && \
+    !defined(__WXPM__) && \
+    !defined(__WXMOTIF__) && \
+    !defined(__WXGTK__) && \
+    !defined(__WXX11__) && \
+    !defined(__WXPALMOS__)
+#    include "wx/msw/gccpriv.h"

 #else
 #else

-    #undef wxCHECK_W32API_VERSION
-    #define wxCHECK_W32API_VERSION(maj, min) (0)
+#    undef wxCHECK_W32API_VERSION
+#    define wxCHECK_W32API_VERSION(maj, min) (0)

 #endif
 
 #endif
 

-#ifdef __SC__
-    #ifdef __DMC__
-         #define __DIGITALMARS__
-    #else
-         #define __SYMANTEC__
-    #endif
+/**
+    This is similar to wxCHECK_GCC_VERSION but for Sun CC compiler.
+ */
+#ifdef __SUNCC__
+    /*
+       __SUNCC__ is 0xVRP where V is major version, R release and P patch level
+     */
+    #define wxCHECK_SUNCC_VERSION(maj, min) (__SUNCC__ >= (((maj)<<8) | ((min)<<4)))
+#else
+    #define wxCHECK_SUNCC_VERSION(maj, min) (0)

 #endif
 
 #endif
 

-#if defined (__WXMSW__)
-    #if !defined(__WATCOMC__)
-        #define wxHAVE_RAW_BITMAP
-    #endif
+/*
+    Handle Darwin gcc universal compilation.  Don't do this in an Apple-
+    specific case since no sane compiler should be defining either
+    __BIG_ENDIAN__ or __LITTLE_ENDIAN__ unless it really is generating
+    code that will be hosted on a machine with the appropriate endianness.
+    If a compiler defines neither, assume the user or configure set
+    WORDS_BIGENDIAN appropriately.
+ */
+#if defined(__BIG_ENDIAN__)
+#    undef WORDS_BIGENDIAN
+#    define WORDS_BIGENDIAN 1
+#elif defined(__LITTLE_ENDIAN__)
+#    undef WORDS_BIGENDIAN
+#elif defined(__WXMAC__) && !defined(WORDS_BIGENDIAN)
+/*  According to Stefan even ancient Mac compilers defined __BIG_ENDIAN__ */
+#    warning "Compiling wxMac with probably wrong endianness"

 #endif
 #endif

+/* also the 32/64 bit universal builds must be handled accordingly */
+#ifdef __DARWIN__
+#    ifdef __LP64__
+#        undef SIZEOF_VOID_P
+#        undef SIZEOF_LONG
+#        undef SIZEOF_SIZE_T
+#        define SIZEOF_VOID_P 8
+#        define SIZEOF_LONG 8
+#        define SIZEOF_SIZE_T 8
+#    else
+#        undef SIZEOF_VOID_P
+#        undef SIZEOF_LONG
+#        undef SIZEOF_SIZE_T
+#        define SIZEOF_VOID_P 4
+#        define SIZEOF_LONG 4
+#        define SIZEOF_SIZE_T 4
+#    endif
+#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
+   and after defining the compiler macros which are used in it too
+ */
+#include "wx/chkconf.h"

 
 

-#if defined (__WXMAC__)
-    #ifndef WORDS_BIGENDIAN
-        #define WORDS_BIGENDIAN 1
-    #endif
+
+/*
+   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
+   in such case.
+ */
+#if defined(_MSC_VER) && (_MSC_VER >= 1310)
+#    undef wxUSE_IOSTREAMH
+#    define wxUSE_IOSTREAMH 0
+#elif defined(__DMC__) || defined(__WATCOMC__)
+#    undef wxUSE_IOSTREAMH
+#    define wxUSE_IOSTREAMH 1
+#elif defined(__MINGW32__)
+#    undef wxUSE_IOSTREAMH
+#    define wxUSE_IOSTREAMH 0
+#endif /* compilers with/without iostream.h */
+
+/*
+   old C++ headers (like <iostream.h>) declare classes in the global namespace
+   while the new, standard ones (like <iostream>) do it in std:: namespace,
+   unless it's an old gcc version.
+
+   using this macro allows constuctions like "wxSTD iostream" to work in
+   either case
+ */
+#if !wxUSE_IOSTREAMH && (!defined(__GNUC__) || ( __GNUC__ > 2 ) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
+#    define wxSTD std::
+#else
+#    define wxSTD
+#endif
+
+/* On OpenVMS with the most recent HP C++ compiler some function (i.e. wscanf)
+ * are only available in the std-namespace. (BUG???)
+ */
+#if defined(  __VMS ) && (__DECCXX_VER >= 70100000) && !defined(__STD_CFRONT) && !defined( __NONAMESPACE_STD )
+# define wxVMS_USE_STD std::
+#else
+# define wxVMS_USE_STD
+#endif
+
+#ifdef __VMS
+#define XtDisplay XTDISPLAY
+#ifdef __WXMOTIF__
+#define XtParent XTPARENT
+#define XtScreen XTSCREEN
+#define XtWindow XTWINDOW
+#endif

 #endif
 
 /* Choose which method we will use for updating menus
 #endif
 
 /* Choose which method we will use for updating menus


@@ -332,11 +762,11 @@
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
  */
 #ifndef wxUSE_IDLEMENUUPDATES
  * Presently, only Windows and GTK+ support wxEVT_MENU_OPEN.
  */
 #ifndef wxUSE_IDLEMENUUPDATES

-    #if defined(__WXMSW__) || defined(__WXGTK__)
-        #define wxUSE_IDLEMENUUPDATES 0
-    #else
-        #define wxUSE_IDLEMENUUPDATES 1
-    #endif
+#    if (defined(__WXMSW__) || defined(__WXGTK__)) && !defined(__WXUNIVERSAL__)
+#        define wxUSE_IDLEMENUUPDATES 0
+#    else
+#        define wxUSE_IDLEMENUUPDATES 1
+#    endif

 #endif
 
 /*
 #endif
 
 /*


@@ -346,16 +776,74 @@
  */
 
 #ifndef wxUSE_FILECONFIG
  */
 
 #ifndef wxUSE_FILECONFIG

-    #if wxUSE_CONFIG
-        #define wxUSE_FILECONFIG 1
-    #else
-        #define wxUSE_FILECONFIG 0
-    #endif
+#    if wxUSE_CONFIG && wxUSE_TEXTFILE
+#        define wxUSE_FILECONFIG 1
+#    else
+#        define wxUSE_FILECONFIG 0
+#    endif

 #endif
 
 #ifndef wxUSE_HOTKEY
 #endif
 
 #ifndef wxUSE_HOTKEY

-    #define wxUSE_HOTKEY 0
+#    define wxUSE_HOTKEY 0

 #endif
 
 #endif
 

-#endif /* _WX_PLATFORM_H_ */
+#if !defined(wxUSE_WXDIB) && defined(__WXMSW__)
+#    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
+
+#if defined (__WXPALMOS__)
+#include "wx/palmos/missing.h"
+#endif // __WXPALMOS__
+
+#if !defined (__WXPALMOS5__)
+#define POSSEC_APPBASE
+#define POSSEC_ARCHIVE
+#define POSSEC_CLNTDATA
+#define POSSEC_CMDLINE
+#define POSSEC_CONFIG
+#define POSSEC_DATETIME
+#define POSSEC_DATETIME2
+#define POSSEC_DATSTRM
+#define POSSEC_DIRCMN
+#define POSSEC_DYNARRAY
+#define POSSEC_DYNLIB
+#define POSSEC_DYNLOAD
+#define POSSEC_ENCCONV
+#define POSSEC_EXTENDED
+#define POSSEC_FFILE
+#define POSSEC_FILE
+#define POSSEC_FILECONF
+#define POSSEC_FILEFN
+#endif // __WXPALMOS5__
+
+/*
+    Optionally supported C++ features.
+ */
+
+/*
+    RTTI: if it is disabled in build/msw/makefile.* then this symbol will
+    already be defined but it's also possible to do it from configure (with
+    g++) or by editing project files with MSVC so test for it here too.
+ */
+#ifndef wxNO_RTTI
+#   ifdef __GNUG__
+#       ifndef __GXX_RTTI
+#           define wxNO_RTTI
+#       endif
+#   elif defined(_MSC_VER)
+#       ifndef _CPPRTTI
+#           define wxNO_RTTI
+#       endif
+#   endif
+#endif // wxNO_RTTI
+
+#endif /* _WX_PLATFORM_H_ */