* Modified by:
* Created: 29.10.01 (extracted from wx/defs.h)
* RCS-ID: $Id$
-* Copyright: (c) 1997-2001 wxWidgets team
+* Copyright: (c) 1997-2001 Vadim Zeitlin
* Licence: wxWindows licence
*/
builds, running under 10.2 + only
*/
#ifdef __WXMAC__
- #if defined(__MACH__)
- #define __WXMAC_OSX__ 1
- #define __WXMAC_CARBON__ 1
- #ifdef __WXMAC_XCODE__
- #include "wx/mac/carbon/config_xcode.h"
- #endif
- #else
- #if TARGET_CARBON
- #define __WXMAC_CARBON__ 1
- #else
- #define __WXMAC_CLASSIC__ 1
- #endif
- #endif
+# if defined(__MACH__)
+# define __WXMAC_OSX__
+# define __WXMAC_CARBON__
+# ifdef __WXMAC_XCODE__
+# include <unistd.h>
+# 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
/*
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
# endif
#endif
+#if defined(__PALMOS__)
+# ifndef __WXPALMOS__
+# define __WXPALMOS__
+# 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
/*
# 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)
+ /* this means Win95-style UI, i.e. Win9x/NT 4+: always true now */
+# if !defined(__WIN95__)
# define __WIN95__
# endif
#endif /* Win32 */
# endif
#endif
+/*
+ Hardware platform detection.
+
+ VC++ defines _M_xxx symbols.
+ */
+#if defined(_M_IX86) || defined(i386) || defined(__i386) || defined(__i386__)
+ #ifndef __INTEL__
+ #define __INTEL__
+ #endif
+#endif /* x86 */
+
+#if defined(_M_IA64)
+ #ifndef __IA64__
+ #define __IA64__
+ #endif
+#endif /* ia64 */
+
+#if defined(_M_MPPC) || defined(__PPC__)
+ #ifndef __POWERPC__
+ #define __POWERPC__
+ #endif
+#endif /* alpha */
+
+#if defined(_M_ALPHA) || defined(__AXP__)
+ #ifndef __ALPHA__
+ #define __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
and is used by wxWidgets, _UNICODE and/or UNICODE may be defined or used by
// otherwise MSL headers bring in WIN32 dependant APIs
#undef UNICODE
#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
/*
old C++ headers (like <iostream.h>) declare classes in the global namespace
- while the new, standard ones (like <iostream>) do it in std:: 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
+#if !wxUSE_IOSTREAMH && (!defined(__GNUC__) || ( __GNUC__ > 2 ) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
# define wxSTD std::
#else
# define wxSTD
# endif
# define wxSIZE_T_IS_UINT
+#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
+
#else /* Windows */
# ifndef __WINDOWS__
# define __WINDOWS__
at least maj.min
*/
#if ( defined( __GNUWIN32__ ) || defined( __MINGW32__ ) || \
- defined( __CYGWIN__ ) || \
+ ( defined( __CYGWIN__ ) && defined( __WINDOWS__ ) ) || \
(defined(__WATCOMC__) && __WATCOMC__ >= 1200) ) && \
- !defined(__DOS__) && !defined(__WXMOTIF__) && !defined(__WXGTK__) && !defined(__WXX11__)
+ !defined(__DOS__) && \
+ !defined(__WXOS2__) && \
+ !defined(__WXMOTIF__) && \
+ !defined(__WXGTK__) && \
+ !defined(__WXX11__) && \
+ !defined(__WXPALMOS__)
# include "wx/msw/gccpriv.h"
#else
# undef wxCHECK_W32API_VERSION
#endif
#if defined (__WXMAC__)
-# ifndef WORDS_BIGENDIAN
+# if !defined(WORDS_BIGENDIAN) && ( !defined(__MACH__) || ( defined(__BIG_ENDIAN__) && __BIG_ENDIAN__ ) )
# define WORDS_BIGENDIAN 1
# endif
#endif
#endif
/*
- We need AvailabilityMacros.h for ifdefing out things that don't exist on
+ 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
*/
#endif
#endif /* _WX_PLATFORM_H_ */
-
projects / wxWidgets.git / blobdiff