X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eb9f2b7086672997f6dafa6b810ed8d5b63a236e..2706e543a6923d8e743c6ec21fcfe898a52aec88:/docs/latex/wx/manual2e.tex diff --git a/docs/latex/wx/manual2e.tex b/docs/latex/wx/manual2e.tex index 2ce18b431c..e9712a9d46 100644 --- a/docs/latex/wx/manual2e.tex +++ b/docs/latex/wx/manual2e.tex @@ -61,13 +61,13 @@ Robin Dunn, et al} \sethotspotcolour{off}% \sethotspotunderline{on}% \large{ -\image{}{cpp.bmp} \helpref{Alphabetical class reference}{classref} +\helpref{Alphabetical class reference}{classref} -\image{}{shelves.bmp} \helpref{Classes by category}{classesbycat} +\helpref{Classes by category}{classesbycat} -\image{}{book1.bmp} \helpref{Topic overviews}{overviews} +\helpref{Topic overviews}{overviews} -\image{}{hand1.bmp} \helpref{Guide to wxWidgets}{wxwinchapters} +\helpref{Guide to wxWidgets}{wxwinchapters} } \sethotspotcolour{on}% \sethotspotunderline{on}% @@ -92,67 +92,73 @@ Robin Dunn, et al} \setfooter{\thepage}{}{}{}{}{\thepage}% \begin{center} -Copyright (c) 1992-2002 Julian Smart, Robert Roebling, Vadim Zeitlin and other +Copyright (c) 1992-2006 Julian Smart, Robert Roebling, Vadim Zeitlin and other members of the wxWidgets team\\ Portions (c) 1996 Artificial Intelligence Applications Institute\\ \end{center} -Please also see the wxWidgets license files (preamble.txt, lgpl.txt, gpl.txt, licence.txt, +Please also see the wxWindows license files (preamble.txt, lgpl.txt, gpl.txt, licence.txt, licendoc.txt) for conditions of software and documentation use. -\section*{wxWidgets Library License, Version 3} +\section*{wxWindows Library License, Version 3.1}\label{wxlicense} -Copyright (c) 1992-2002 Julian Smart, Robert Roebling, Vadim Zeitlin et al. +% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! +% +% NB: this is exact copy of docs/licence.txt file. DO NOT modify this +% section, it MUST be identical to docs/licence.txt! +% +% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. +of this licence document, but changing it is not allowed. \begin{center} -WXWINDOWS LIBRARY LICENSE\\ -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION +WXWINDOWS LIBRARY LICENCE \\ +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION \end{center} -This library is free software; you can redistribute it and/or modify it -under the terms of the GNU Library General Public License as published by -the Free Software Foundation; either version 2 of the License, or (at -your option) any later version. +This library is free software; you can redistribute it and/or modify it +under the terms of the GNU Library General Public Licence as published by +the Free Software Foundation; either version 2 of the Licence, or (at +your option) any later version. -This library is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library -General Public License for more details. +This library is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library +General Public Licence for more details. -You should have received a copy of the GNU Library General Public License -along with this software, usually in a file named COPYING.LIB. If not, +You should have received a copy of the GNU Library General Public Licence +along with this software, usually in a file named COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, -Boston, MA~02111-1307 USA. - -EXCEPTION NOTICE - -1. As a special exception, the copyright holders of this library give -permission for additional uses of the text contained in this release of -the library as licensed under the wxWidgets Library License, applying -either version 3 of the License, or (at your option) any later version of -the License as published by the copyright holders of version 3 of the -License document. - -2. The exception is that you may create binary object code versions of any -works using this library or based on this library, and use, copy, modify, -link and distribute such binary object code files unrestricted under terms -of your choice. - -3. If you copy code from files distributed under the terms of the GNU -General Public License or the GNU Library General Public License into a -copy of this library, as this license permits, the exception does not -apply to the code that you add in this way. To avoid misleading anyone as -to the status of such modified files, you must delete this exception +Boston, MA 02111-1307 USA. + +EXCEPTION NOTICE + +1. As a special exception, the copyright holders of this library give +permission for additional uses of the text contained in this release of +the library as licenced under the wxWindows Library Licence, applying +either version 3.1 of the Licence, or (at your option) any later version of +the Licence as published by the copyright holders of version 3.1 of the +Licence document. + +2. The exception is that you may use, copy, link, modify and distribute +under your own terms, binary object code versions of works based +on the Library. + +3. If you copy code from files distributed under the terms of the GNU +General Public Licence or the GNU Library General Public Licence into a +copy of this library, as this licence permits, the exception does not +apply to the code that you add in this way. To avoid misleading anyone as +to the status of such modified files, you must delete this exception notice from such code and/or adjust the licensing conditions notice -accordingly. +accordingly. -4. If you write modifications of your own for this library, it is your +4. If you write modifications of your own for this library, it is your 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. +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}