Compilation fix.

[wxWidgets.git] / docs / latex / wx / cppconst.tex

diff --git a/docs/latex/wx/cppconst.tex b/docs/latex/wx/cppconst.tex
index 8f0cb52d3994a0f4092dfc5b495873cb46d3c58e..f359723f7f6bec3726b29985ac18e90c2fc58676 100644 (file)
--- a/docs/latex/wx/cppconst.tex
+++ b/docs/latex/wx/cppconst.tex
@@ -14,7 +14,8 @@ by category (and sorted by alphabetical order inside each category).
 \twocolitem{\_\_WXGTK12\_\_}{GTK 1.2 or higher}
 \twocolitem{\_\_WXGTK20\_\_}{GTK 2.0 or higher}
 \twocolitem{\_\_WXMOTIF\_\_}{Motif}
 \twocolitem{\_\_WXGTK12\_\_}{GTK 1.2 or higher}
 \twocolitem{\_\_WXGTK20\_\_}{GTK 2.0 or higher}
 \twocolitem{\_\_WXMOTIF\_\_}{Motif}

-\twocolitem{\_\_WXMAC\_\_}{MacOS}
+\twocolitem{\_\_WXMOTIF20\_\_}{Motif 2.0 or higher}
+\twocolitem{\_\_WXMAC\_\_}{Mac OS whether Classic (Mac OS 8/9 TARGET\_CARBON == 0) or Carbon (including Mac OS X TARGET\_CARBON == 1)}

 \twocolitem{\_\_WXMGL\_\_}{SciTech Soft MGL (\_\_WXUNIVERSAL\_\_ will be also
 defined)}
 \twocolitem{\_\_WXMSW\_\_}{Any Windows}
 \twocolitem{\_\_WXMGL\_\_}{SciTech Soft MGL (\_\_WXUNIVERSAL\_\_ will be also
 defined)}
 \twocolitem{\_\_WXMSW\_\_}{Any Windows}


@@ -41,12 +42,13 @@ only GUIs implemented for 2.0 are \_\_WXGTK\_\_, \_\_WXMSW\_\_ and
 \twocolitem{\_\_AIX\_\_}{AIX}
 \twocolitem{\_\_BSD\_\_}{Any *BSD system}
 \twocolitem{\_\_CYGWIN\_\_}{Cygwin: Unix on Win32}
 \twocolitem{\_\_AIX\_\_}{AIX}
 \twocolitem{\_\_BSD\_\_}{Any *BSD system}
 \twocolitem{\_\_CYGWIN\_\_}{Cygwin: Unix on Win32}

-\twocolitem{\_\_DARWIN\_\_}{Mac OS X}
+\twocolitem{\_\_DARWIN\_\_}{Mac OS X using the BSD Unix C library (as opposed to using the Metrowerks MSL C/C++ library)}

 \twocolitem{\_\_DATA\_GENERAL\_\_}{DG-UX}
 \twocolitem{\_\_DOS\_GENERAL\_\_}{DOS (used with wxMGL only)}
 \twocolitem{\_\_FREEBSD\_\_}{FreeBSD}
 \twocolitem{\_\_HPUX\_\_}{HP-UX (Unix)}
 \twocolitem{\_\_LINUX\_\_}{Linux}
 \twocolitem{\_\_DATA\_GENERAL\_\_}{DG-UX}
 \twocolitem{\_\_DOS\_GENERAL\_\_}{DOS (used with wxMGL only)}
 \twocolitem{\_\_FREEBSD\_\_}{FreeBSD}
 \twocolitem{\_\_HPUX\_\_}{HP-UX (Unix)}
 \twocolitem{\_\_LINUX\_\_}{Linux}

+\twocolitem{\_\_MACH\_\_}{Mach-O Architecture (Mac OS X only builds)}

 \twocolitem{\_\_OSF\_\_}{OSF/1}
 \twocolitem{\_\_SGI\_\_}{IRIX}
 \twocolitem{\_\_SOLARIS\_\_}{Solaris}
 \twocolitem{\_\_OSF\_\_}{OSF/1}
 \twocolitem{\_\_SGI\_\_}{IRIX}
 \twocolitem{\_\_SOLARIS\_\_}{Solaris}


@@ -99,7 +101,7 @@ the compiler version, $1100$ is $11.0$ and $1200$ is OpenWatcom.}
 \begin{twocollist}\itemsep=0pt
 \twocolitem{\_\_WXDEBUG\_\_}{defined in debug mode, undefined in release mode}
 \twocolitem{wxUSE\_XXX}{if defined as $1$, feature XXX is active
 \begin{twocollist}\itemsep=0pt
 \twocolitem{\_\_WXDEBUG\_\_}{defined in debug mode, undefined in release mode}
 \twocolitem{wxUSE\_XXX}{if defined as $1$, feature XXX is active

-(the symbols of this form are always defined, use #if and not #ifdef to test
+(the symbols of this form are always defined, use \#if and not \#ifdef to test

  for them)}
 \end{twocollist}
 
  for them)}
 \end{twocollist}