Merge tag 'wxPython-4.0.2' into wxPy-4.0.x

(cherry picked from commit 4c56c39e52)
2026-01-06 20:10:08 +01:00 · 2018-06-17 21:32:08 -07:00
parent 9221cbef4b
commit b77c88a280
298 changed files with 450 additions and 332 deletions
--- a/src/init.py
+++ b/src/init.py
@@ -3,7 +3,7 @@
 # Author:      Robin Dunn
 #
 # Created:     3-Nov-2010
-# Copyright:   (c) 2010-2017 by Total Control Software
+# Copyright:   (c) 2010-2018 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------

--- a/src/arrayholder.h
+++ b/src/arrayholder.h
@@ -6,7 +6,7 @@
 // Author:      Robin Dunn
 //
 // Created:     20-Oct-2011
-// Copyright:   (c) 2011-2017 by Total Control Software
+// Copyright:   (c) 2011-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/arrayholder.sip
+++ b/src/arrayholder.sip
@@ -5,7 +5,7 @@
 // Author:      Robin Dunn
 //
 // Created:     14-March-2012
-// Copyright:   (c) 2012-2017 by Total Control Software
+// Copyright:   (c) 2012-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/arrays.sip
+++ b/src/arrays.sip
@@ -5,7 +5,7 @@
 // Author:      Robin Dunn
 //
 // Created:     2-Sept-2011
-// Copyright:   (c) 2011-2017 by Total Control Software
+// Copyright:   (c) 2011-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/bitmap_ex.cpp
+++ b/src/bitmap_ex.cpp
@@ -7,7 +7,7 @@
 // Author:      Robin Dunn
 //
 // Created:     27-Apr-2012
-// Copyright:   (c) 2012-2017 by Total Control Software
+// Copyright:   (c) 2012-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/bitmap_ex.h
+++ b/src/bitmap_ex.h
@@ -6,7 +6,7 @@
 // Author:      Robin Dunn
 //
 // Created:     27-Apr-2012
-// Copyright:   (c) 2012-2017 by Total Control Software
+// Copyright:   (c) 2012-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/clntdata.sip
+++ b/src/clntdata.sip
@@ -5,7 +5,7 @@
 // Author:      Robin Dunn
 //
 // Created:     16-Nov-2010
-// Copyright:   (c) 2010-2017 by Total Control Software
+// Copyright:   (c) 2010-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/dc_ex.cpp
+++ b/src/dc_ex.cpp
@@ -5,7 +5,7 @@
 // Author:      Robin Dunn
 //
 // Created:     18-Aug-2012
-// Copyright:   (c) 2012-2017 by Total Control Software
+// Copyright:   (c) 2012-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/dvcvariant.sip
+++ b/src/dvcvariant.sip
@@ -5,7 +5,7 @@
 // Author:      Robin Dunn
 //
 // Created:     9-Nov-2012
-// Copyright:   (c) 2012-2017 by Total Control Software
+// Copyright:   (c) 2012-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/filename.sip
+++ b/src/filename.sip
@@ -5,7 +5,7 @@
 // Author:      Robin Dunn
 //
 // Created:     30-July-2012
-// Copyright:   (c) 2012-2017 by Total Control Software
+// Copyright:   (c) 2012-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/gizmos.py
+++ b/src/gizmos.py
@@ -3,7 +3,7 @@
 # Author:      Robin Dunn
 #
 # Created:     27-Oct-2017
-# Copyright:   (c) 2017 by Total Control Software
+# Copyright:   (c) 2017-2018 by Total Control Software
 # License:     wxWindows License
 #---------------------------------------------------------------------------

--- a/src/longlong.sip
+++ b/src/longlong.sip
@@ -5,7 +5,7 @@
 // Author:      Robin Dunn
 //
 // Created:     29-Feb-2012
-// Copyright:   (c) 2012-2017 by Total Control Software
+// Copyright:   (c) 2012-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/msgdlg_btnlabel.sip
+++ b/src/msgdlg_btnlabel.sip
@@ -6,7 +6,7 @@
 // Author:      Robin Dunn
 //
 // Created:     18-Nov-2017
-// Copyright:   (c) 2017 by Total Control Software
+// Copyright:   (c) 2017-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/pgvariant.sip
+++ b/src/pgvariant.sip
@@ -4,8 +4,8 @@
 //
 // Author:      Robin Dunn
 //
-// Created:     24-Feb-2017
-// Copyright:   (c) 2017 by Total Control Software
+// Created:     24-Feb-2018
+// Copyright:   (c) 2017-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/pseudodc.cpp
+++ b/src/pseudodc.cpp
@@ -5,7 +5,7 @@
 // Modified by: Robin Dunn
 //
 // Created:     25-May-2006
-// Copyright:   (c) 2006-2017 Total Control Software
+// Copyright:   (c) 2006-2018 Total Control Software
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/src/pseudodc.h
+++ b/src/pseudodc.h
@@ -5,7 +5,7 @@
 // Modified by: Robin Dunn
 //
 // Created:     25-May-2006
-// Copyright:   (c) 2006-2017 Total Control Software
+// Copyright:   (c) 2006-2018 Total Control Software
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////

--- a/src/pyevent.h
+++ b/src/pyevent.h
@@ -6,7 +6,7 @@
 // Author:      Robin Dunn
 //
 // Created:     18-Dec-2010
-// Copyright:   (c) 2010-2017 by Total Control Software
+// Copyright:   (c) 2010-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/stockgdi.sip
+++ b/src/stockgdi.sip
@@ -8,7 +8,7 @@
 // Author:      Robin Dunn
 //
 // Created:     18-Sept-2011
-// Copyright:   (c) 2011-2017 by Total Control Software
+// Copyright:   (c) 2011-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/string.sip
+++ b/src/string.sip
@@ -5,7 +5,7 @@
 // Author:      Robin Dunn
 //
 // Created:     9-Nov-2010
-// Copyright:   (c) 2010-2017 by Total Control Software
+// Copyright:   (c) 2010-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/treeitemdata.sip
+++ b/src/treeitemdata.sip
@@ -6,7 +6,7 @@
 // Author:      Robin Dunn
 //
 // Created:     28-Mar-2012
-// Copyright:   (c) 2012-2017 by Total Control Software
+// Copyright:   (c) 2012-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/userdata.sip
+++ b/src/userdata.sip
@@ -6,7 +6,7 @@
 //
 // Created:     06-Sept-2011
 // Copyright:   (c) 2011 by Wide Open Technologies
-// Copyright:   (c) 2011-2017 by Total Control Software
+// Copyright:   (c) 2011-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/variant.sip
+++ b/src/variant.sip
@@ -6,7 +6,7 @@
 //
 // Created:     20-Sept-2011
 // Copyright:   (c) 2011 by Kevin Ollivier
-// Copyright:   (c) 2011-2017 by Total Control Software
+// Copyright:   (c) 2011-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/wacky_ints.sip
+++ b/src/wacky_ints.sip
@@ -8,7 +8,7 @@
 // Author:      Robin Dunn
 //
 // Created:     4-March-2016
-// Copyright:   (c) 2016-2017 by Total Control Software
+// Copyright:   (c) 2016-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/wxpy_api.h
+++ b/src/wxpy_api.h
@@ -8,7 +8,7 @@
 // Author:      Robin Dunn
 //
 // Created:     19-Nov-2010
-// Copyright:   (c) 2010-2017 by Total Control Software
+// Copyright:   (c) 2010-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/wxpy_api.sip
+++ b/src/wxpy_api.sip
@@ -6,7 +6,7 @@
 // Author:      Robin Dunn
 //
 // Created:     19-Nov-2010
-// Copyright:   (c) 2010-2017 by Total Control Software
+// Copyright:   (c) 2010-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/wxpybuffer.h
+++ b/src/wxpybuffer.h
@@ -7,7 +7,7 @@
 // Author:      Robin Dunn
 //
 // Created:     26-Apr-2012
-// Copyright:   (c) 2012-2017 by Total Control Software
+// Copyright:   (c) 2012-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------

--- a/src/wxpybuffer.sip
+++ b/src/wxpybuffer.sip
@@ -8,7 +8,7 @@
 // Author:      Robin Dunn
 //
 // Created:     26-Apr-2012
-// Copyright:   (c) 2012-2017 by Total Control Software
+// Copyright:   (c) 2012-2018 by Total Control Software
 // Licence:     wxWindows license
 //--------------------------------------------------------------------------