X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..566e85f6ec147263f086847e0317f46705924903:/docs/latex/wx/manual.tex?ds=inline

diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index 91e3b2aa0e..aeea3d5cdf 100644
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -26,13 +26,13 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
-\title{wxWindows 2.3.4: A portable C++ and Python GUI toolkit}
+\title{wxWidgets 2.5.4: A portable C++ and Python GUI toolkit}
 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}
-\date{November 2002}
+\date{February, 2005}
 }
 \makeindex
 \begin{document}
@@ -47,7 +47,7 @@ Robin Dunn, et al}
 % A special table of contents for the WinHelp manual
 \begin{comment}
 \winhelponly{
-\chapter{wxWindows class library reference}\label{winhelpcontents}
+\chapter{wxWidgets class library reference}\label{winhelpcontents}
 
 \centerline{
 %\image{}{wxwin.wmf}
@@ -62,19 +62,19 @@ Robin Dunn, et al}
 
 \image{}{book1.bmp} \helpref{Topic overviews}{overviews}
 
-\image{}{hand1.bmp} \helpref{Guide to wxWindows}{wxwinchapters}
+\image{}{hand1.bmp} \helpref{Guide to wxWidgets}{wxwinchapters}
 }
 \sethotspotcolour{on}%
 \sethotspotunderline{on}%
 
-\chapter*{Overview of wxWindows}\label{wxwinchapters}
+\chapter*{Overview of wxWidgets}\label{wxwinchapters}
 
 \helpref{Introduction}{introduction}\\
 %\helpref{Resource guide}{resguide}\\
 %\helpref{Comparison with other GUI models}{comparison}\\
-%\helpref{Multi-platform development with wxWindows}{multiplat}\\
+%\helpref{Multi-platform development with wxWidgets}{multiplat}\\
 %\helpref{Tutorial}{tutorial}\\
-\helpref{The wxWindows resource system}{resourceformats}\\
+\helpref{The wxWidgets resource system}{resourceformats}\\
 \helpref{Utilities}{utilities}\\
 \helpref{Programming strategies}{strategies}\\
 \helpref{Bugs and future directions}{bugs}\\
@@ -82,22 +82,24 @@ Robin Dunn, et al}
 }
 \end{comment}
 
-\chapter{Copyright notice}
+\chapter{Copyright notice}\label{copyrightnotice}
 \setheader{{\it COPYRIGHT}}{}{}{}{}{{\it COPYRIGHT}}%
 \setfooter{\thepage}{}{}{}{}{\thepage}%
 
 \begin{center}
 Copyright (c) 1992-2002 Julian Smart, Robert Roebling, Vadim Zeitlin and other
-members of the wxWindows team\\
+members of the wxWidgets team\\
 Portions (c) 1996 Artificial Intelligence Applications Institute\\
 \end{center}
 
-Please also see the wxWindows license files (preamble.txt, lgpl.txt, gpl.txt, license.txt,
+Please also see the wxWidgets license files (preamble.txt, lgpl.txt, gpl.txt, licence.txt,
 licendoc.txt) for conditions of software and documentation use.
+Note that we use the old name wxWindows in the license, pending
+recognition of the new name by OSI.
 
-\section*{wxWindows Library License, Version 3}
+\section*{wxWindows Library License, Version 3}\label{wxlicense}
 
-Copyright (c) 1992-2002 Julian Smart, Robert Roebling, Vadim Zeitlin et al. 
+Copyright (c) 1992-2004 Julian Smart, Robert Roebling, Vadim Zeitlin et al. 
 
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed. 
@@ -149,7 +151,7 @@ choice whether to permit this exception to apply to your modifications.
 If you do not wish that, you must delete the exception notice from such 
 code and/or adjust the licensing conditions notice accordingly. 
 
-\section*{GNU Library General Public License, Version 2}
+\section*{GNU Library General Public License, Version 2}\label{gnulicense}
 
 Copyright (C) 1991 Free Software Foundation, Inc.
 675 Mass Ave, Cambridge, MA 02139, USA
@@ -632,7 +634,7 @@ You should have received a copy of the GNU Library General Public
 License along with this library; if not, write to the Free
 Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 \end{verbatim}
-}
+}%
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -648,11 +650,12 @@ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
 <signature of Ty Coon>, 1 April 1990
 Ty Coon, President of Vice
 \end{verbatim} 
-}
+}%
 
 That's all there is to it!
 
 \input body.tex
+\input libs.tex
 \input classes.tex
 \input function.tex
 \input constant.tex