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

fix __SUNCC__ definition; added wxCHECK_SUNCC_VERSION

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2007-06-22 13:58:05 +00:00
parent f6e3890101
commit 2686d9339b
3 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/cppconst.tex
View File

@@ -144,7 +144,7 @@ to the compiler version: $500$ is $5.0$.}
\helpref{wxCHECK\_W32API\_VERSION}{wxcheckw32apiversion}} \helpref{wxCHECK\_W32API\_VERSION}{wxcheckw32apiversion}}
\twocolitem{\_\_MINGW32\_\_}{MinGW} \twocolitem{\_\_MINGW32\_\_}{MinGW}
\twocolitem{\_\_MWERKS\_\_}{CodeWarrior MetroWerks compiler} \twocolitem{\_\_MWERKS\_\_}{CodeWarrior MetroWerks compiler}
\twocolitem{\_\_SUNCC\_\_}{Sun CC} \twocolitem{\_\_SUNCC\_\_}{Sun CC, see also \helpref{wxCHECK\_SUNCC\_VERSION}{wxchecksunccversion}}
\twocolitem{\_\_SYMANTECC\_\_}{Symantec C++} \twocolitem{\_\_SYMANTECC\_\_}{Symantec C++}
\twocolitem{\_\_VISAGECPP\_\_}{IBM Visual Age (OS/2)} \twocolitem{\_\_VISAGECPP\_\_}{IBM Visual Age (OS/2)}
\twocolitem{\_\_VISUALC\_\_}{Microsoft Visual C++. The value of this macro \twocolitem{\_\_VISUALC\_\_}{Microsoft Visual C++. The value of this macro

10
docs/latex/wx/function.tex
View File

@@ -45,6 +45,7 @@ the corresponding topic.
\helpref{wxCHECK\_GCC\_VERSION}{wxcheckgccversion}\\ \helpref{wxCHECK\_GCC\_VERSION}{wxcheckgccversion}\\
\helpref{wxCHECK\_MSG}{wxcheckmsg}\\ \helpref{wxCHECK\_MSG}{wxcheckmsg}\\
\helpref{wxCHECK\_RET}{wxcheckret}\\ \helpref{wxCHECK\_RET}{wxcheckret}\\
\helpref{wxCHECK\_SUNCC\_VERSION}{wxchecksunccversion}\\
\helpref{wxCHECK\_VERSION}{wxcheckversion}\\ \helpref{wxCHECK\_VERSION}{wxcheckversion}\\
\helpref{wxCHECK\_VERSION\_FULL}{wxcheckversionfull}\\ \helpref{wxCHECK\_VERSION\_FULL}{wxcheckversionfull}\\
\helpref{wxCHECK\_W32API\_VERSION}{wxcheckw32apiversion}\\ \helpref{wxCHECK\_W32API\_VERSION}{wxcheckw32apiversion}\\
@@ -317,6 +318,15 @@ compiler (g++) version major.minor or greater. Otherwise, and also if
the compiler is not GNU C++ at all, returns $0$. the compiler is not GNU C++ at all, returns $0$.
\membersection{wxCHECK\_SUNCC\_VERSION}\label{wxchecksunccversion}
\func{bool}{wxCHECK\_SUNCC\_VERSION}{\param{}{major, minor}}
Returns $1$ if the compiler being used to compile the code is Sun CC Pro
compiler and its version is at least \texttt{major.minor}. Otherwise returns
$0$.
\membersection{wxCHECK\_VERSION}\label{wxcheckversion} \membersection{wxCHECK\_VERSION}\label{wxcheckversion}
\func{bool}{wxCHECK\_VERSION}{\param{}{major, minor, release}} \func{bool}{wxCHECK\_VERSION}{\param{}{major, minor, release}}

24
include/wx/platform.h
View File

@@ -357,13 +357,11 @@
# endif # endif
# endif /* SGI */ # endif /* SGI */
# if defined(sun) || defined(__SUN__) # if defined(__SUNPRO_CC)
# ifndef __GNUG__ # ifndef __SUNCC__
# ifndef __SUNCC__ # define __SUNCC__ __SUNPRO_CC
# define __SUNCC__ # endif /* Sun CC */
# endif /* Sun CC */ # endif /* Sun CC */
# endif
# endif /* Sun */
# ifdef __EMX__ # ifdef __EMX__
# define OS2EMX_PLAIN_CHAR # define OS2EMX_PLAIN_CHAR
@@ -558,6 +556,18 @@
# define wxCHECK_W32API_VERSION(maj, min) (0) # define wxCHECK_W32API_VERSION(maj, min) (0)
#endif #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
#if defined (__WXMSW__) #if defined (__WXMSW__)
# if !defined(__WATCOMC__) # if !defined(__WATCOMC__)
# define wxHAVE_RAW_BITMAP # define wxHAVE_RAW_BITMAP