X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/81d66cf39f810503baed79213bc3122fda0ccc7b..d45d30c8682f858321600e2958167d7ef54ebeb5:/docs/latex/wx/manual.tex

diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index cc4040b2c7..a66d310f34 100644
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -1,6 +1,7 @@
-\documentstyle[a4,11pt,makeidx,verbatim,texhelp,fancyheadings,palatino]{thesis}
-% JACS: doesn't make it through Tex2RTF, sorry.I'll put it into texhelp.sty
+\documentstyle[a4,11pt,makeidx,verbatim,texhelp,fancyheadings,palatino]{report}
+% JACS: doesn't make it through Tex2RTF, sorry. I'll put it into texhelp.sty
 % since Tex2RTF doesn't parse it.
+% BTW, style MUST be report for it to work for Tex2RTF.
 %KB:
 %\addtolength{\textwidth}{1in}
 %\addtolength{\oddsidemargin}{-0.5in}
@@ -24,12 +25,13 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
-\title{User Manual for wxWindows 2.0: a portable C++ GUI toolkit}
-\winhelponly{\author{by Julian Smart and Markus Holzem
+\title{wxWindows 2.1: A portable C++ and Python GUI toolkit}
+\winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
-\winhelpignore{\author{Julian Smart}
-\date{June 4th 1998}
+\winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
+Robin Dunn, et al}
+\date{November 8th 1999}
 }
 \makeindex
 \begin{document}
@@ -84,31 +86,22 @@
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
 \begin{center}
-Copyright (c) 1997 Julian Smart and Markus Holzem\\
+(c)  1999 Julian Smart, Robert Roebling, Vadim Zeitlin and other
+members of the wxWindows team\\
 Portions (c) 1996 Artificial Intelligence Applications Institute\\
 \end{center}
 
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose is hereby granted without fee, provided that the
-above copyright notice, author statement and this permission notice appear in
-all copies of this software and related documentation.
-
-THE SOFTWARE IS PROVIDED ``AS-IS'' AND WITHOUT WARRANTY OF ANY KIND, EXPRESS,
-IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-
-IN NO EVENT SHALL THE ARTIFICIAL INTELLIGENCE APPLICATIONS INSTITUTE OR THE
-UNIVERSITY OF EDINBURGH OR JULIAN SMART OR MARKUS HOLZEM BE LIABLE FOR ANY SPECIAL, INCIDENTAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF THE POSSIBILITY OF
-DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH
-THE USE OR PERFORMANCE OF THIS SOFTWARE.
+Please see the wxWindows licence files (preamble.txt, lgpl.txt, gpl.txt, licence.txt,
+licendoc.txt) for conditions of software and documentation use.
 
 \input{body.tex}
 \helpinput{classes.tex}
 \helpinput{category.tex}
 \helpinput{topics.tex}
+\helpinput{wxhtml.tex}
+\helpinput{wxPython.tex}
 
+\begin{comment}
 \newpage
 
 % Puts books in the bibliography without needing to cite them in the
@@ -124,10 +117,23 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 \addcontentsline{toc}{chapter}{Bibliography}
 \setheader{{\it REFERENCES}}{}{}{}{}{{\it REFERENCES}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
+\end{comment}
 
 \newpage
+% Note: In RTF, the \printindex must come before the
+% change of header/footer, since the \printindex inserts
+% the RTF \sect command which divides one chapter from
+% the next.
+\rtfonly{\printindex
 \addcontentsline{toc}{chapter}{Index}
 \setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
-\setfooter{\thepage}{}{}{}{}{\thepage}%
+\setfooter{\thepage}{}{}{}{}{\thepage}
+}
+% In Latex, it must be this way around (I think)
+\latexonly{\addcontentsline{toc}{chapter}{Index}
+\setheader{{\it INDEX}}{}{}{}{}{{\it INDEX}}%
+\setfooter{\thepage}{}{}{}{}{\thepage}
 \printindex
+}
+
 \end{document}