Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

This commit was manufactured by cvs2svn to create tag 'wxPy_2_6_3_3'.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/tags/wxPy_2_6_3_3@40115 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Bryan Petty
2006-07-16 07:00:28 +00:00
parent 219ee9ba9d
commit 3af18ac68c
2178 changed files with 231496 additions and 259769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/wx/platform.h
View File

@@ -246,11 +246,24 @@
#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
/*
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
#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
@@ -484,9 +497,11 @@
# define __STDC_EXT__ 1
#endif
/* Force linking against required libraries under Windows CE: */
/* Force linking against required libraries under Windows: */
#ifdef __WXWINCE__
# include "wx/msw/wince/libraries.h"
#elif defined __WINDOWS__
# include "wx/msw/libraries.h"
#endif
/*
@@ -498,10 +513,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