From: Dimitri Schoolwerth Date: Mon, 4 Apr 2011 09:21:52 +0000 (+0000) Subject: Changed licence references to "wxWindows licence". X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3fdcd5d5ab5629906a44a76acb6d7ca623347812?ds=sidebyside Changed licence references to "wxWindows licence". Use "wxWindows licence" and not "wxWidgets licence" and also use British spelling for licence. Updated new occurrences in recently added files and a couple of previously (r64940) missed ones. See #12165. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67387 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/docs/doxygen/mainpages/copyright.h b/docs/doxygen/mainpages/copyright.h index accd00a527..004edc8df1 100644 --- a/docs/doxygen/mainpages/copyright.h +++ b/docs/doxygen/mainpages/copyright.h @@ -17,14 +17,14 @@ Portions (c) 1996 Artificial Intelligence Applications Institute Please also see the wxWindows licence 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 +Note that we use the old name wxWindows in the licence, pending recognition of the new name by OSI. @li @subpage page_copyright_wxlicense @li @subpage page_copyright_gnulicense -@page page_copyright_wxlicense wxWindows Library License +@page page_copyright_wxlicense wxWindows Library Licence @verbinclude "licence.txt" diff --git a/interface/wx/commandlinkbutton.h b/interface/wx/commandlinkbutton.h index 96ebf5cffc..4089c2a55c 100644 --- a/interface/wx/commandlinkbutton.h +++ b/interface/wx/commandlinkbutton.h @@ -3,7 +3,7 @@ // Purpose: interface of wxCommandLinkButton // Author: wxWidgets team // RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /** diff --git a/interface/wx/richmsgdlg.h b/interface/wx/richmsgdlg.h index a69022132a..3ebedc6c6c 100644 --- a/interface/wx/richmsgdlg.h +++ b/interface/wx/richmsgdlg.h @@ -3,7 +3,7 @@ // Purpose: interface of wxRichMessageDialog // Author: wxWidgets team // RCS-ID: $Id$ -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /** diff --git a/interface/wx/valnum.h b/interface/wx/valnum.h index 56268d3647..3cf138a07e 100644 --- a/interface/wx/valnum.h +++ b/interface/wx/valnum.h @@ -5,7 +5,7 @@ // Created: 2010-11-06 // Copyright: (c) 2010 wxWidgets team // (c) 2011 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /** diff --git a/interface/wx/xrc/xh_sizer.h b/interface/wx/xrc/xh_sizer.h index 34dd6cb956..ce1c9c1b63 100644 --- a/interface/wx/xrc/xh_sizer.h +++ b/interface/wx/xrc/xh_sizer.h @@ -4,7 +4,7 @@ // Author: Kinaou Hervé // Created: 2010-10-24 // Copyright: (c) 2010 wxWidgets development team -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// /** diff --git a/samples/console/console.cpp b/samples/console/console.cpp index 9a4f4a3b2c..89647376ce 100644 --- a/samples/console/console.cpp +++ b/samples/console/console.cpp @@ -6,7 +6,7 @@ // Created: 04.10.99 // RCS-ID: $Id$ // Copyright: (c) 1999 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// // ============================================================================ diff --git a/samples/xti/classlist.cpp b/samples/xti/classlist.cpp index 513d2bc7ad..03527270c5 100644 --- a/samples/xti/classlist.cpp +++ b/samples/xti/classlist.cpp @@ -6,7 +6,7 @@ // Created: 03/06/2007 14:49:55 // RCS-ID: $Id$ // Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWidgets license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// diff --git a/samples/xti/classlist.h b/samples/xti/classlist.h index bcb19821ea..964e861e2c 100644 --- a/samples/xti/classlist.h +++ b/samples/xti/classlist.h @@ -6,7 +6,7 @@ // Created: 03/06/2007 14:49:55 // RCS-ID: $Id$ // Copyright: (c) 2007 Francesco Montorsi -// Licence: wxWidgets license +// Licence: wxWindows licence //////////////////////////////////////////////////// #ifndef _CLASSLIST_H_ diff --git a/tests/testableframe.cpp b/tests/testableframe.cpp index d69be423eb..9617cfde09 100644 --- a/tests/testableframe.cpp +++ b/tests/testableframe.cpp @@ -4,7 +4,7 @@ // Author: Steven Lamerton // RCS-ID: $Id$ // Copyright: (c) 2010 Steven Lamerton -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // For compilers that support precompilation, includes "wx/wx.h". diff --git a/tests/testableframe.h b/tests/testableframe.h index 1e0fa21318..29e03658f7 100644 --- a/tests/testableframe.h +++ b/tests/testableframe.h @@ -4,7 +4,7 @@ // Author: Steven Lamerton // RCS-ID: $Id$ // Copyright: (c) 2010 Steven Lamerton -// Licence: wxWidgets licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #include "wx/frame.h"