Updates needed to switch to wx master branch (3.2.0)

CHANGES.rst

@@ -8,13 +8,13 @@
 wxPython Changelog
 ==================
 
-4.1.2 "Rumors of my death are only slightly exaggerated"
+4.2.0 "Rumors of my death are only slightly exaggerated"
 --------------------------------------------------------
 * (unreleased)
 
-PyPI:   https://pypi.python.org/pypi/wxPython/4.1.2
+PyPI:   https://pypi.python.org/pypi/wxPython/4.2.0
 Extras: https://extras.wxPython.org/wxPython4/extras/
-Pip:    ``pip install wxPython==4.1.2``
+Pip:    ``pip install wxPython==4.2.0``
 
 New and improved in this release:
 
@@ -24,7 +24,7 @@ New and improved in this release:
   couple release cycles. I can't say that things are fully back to normal yet,
   but at least I now know what I'm doing. Mostly. <wink>
 
-* This release is built using wxWidgets code very near the wxWidgets' 3.1.7
+* This release is built using wxWidgets code very near the wxWidgets' 3.2.0
   release tag.
 
 * Tweaked the build scripts a bit to ensure that on non-Windows platforms that

buildtools/version.py

@@ -23,8 +23,8 @@ PROJECT_NAME     = 'wxPython'
 # MINOR numbers each time there is a corresponding bump in the wxWidgets
 # version numbers.
 VER_MAJOR        = 4
-VER_MINOR        = 1
+VER_MINOR        = 2
-VER_RELEASE      = 2
+VER_RELEASE      = 0
 
 VER_FLAGS        = "a1"     # wxPython release flags
 
@@ -61,6 +61,6 @@ VER_FLAGS        = "a1"     # wxPython release flags
 
 # The version numbers of wxWidgets to be used in the build
 wxVER_MAJOR        = 3
-wxVER_MINOR        = 1
+wxVER_MINOR        = 2
-wxVER_RELEASE      = 7  # only used when wxVER_MINOR is an odd value
+wxVER_RELEASE      = 0  # only used when wxVER_MINOR is an odd value
 

docs/sphinx/itemToModuleMap.json

@@ -610,6 +610,7 @@
 "COMPOSITION_DEST_IN":"wx.",
 "COMPOSITION_DEST_OUT":"wx.",
 "COMPOSITION_DEST_OVER":"wx.",
+"COMPOSITION_DIFF":"wx.",
 "COMPOSITION_IN":"wx.",
 "COMPOSITION_INVALID":"wx.",
 "COMPOSITION_OUT":"wx.",

etg/bmpbndl.py

@@ -37,7 +37,7 @@ def run():
 
     c = module.find('wxBitmapBundle')
     assert isinstance(c, etgtools.ClassDef)
-
+    c.find('wxBitmapBundle').findOverload('xpm').ignore()
     c.find('FromSVG').findOverload('char *data, const wxSize &sizeDef').ignore()
     c.find('FromImpl.impl').transfer = True
 

etg/menuitem.py

@@ -113,9 +113,10 @@ def run():
         """)
 
 
-    c.find('GetBitmap').type = 'wxBitmap*'
+    m = c.find('GetBitmap').findOverload('checked')
-    c.find('GetBitmap').factory = True
+    m.type = 'wxBitmap*'
-    c.find('GetBitmap').setCppCode("""\
+    m.factory = True
+    m.setCppCode("""\
         #ifdef __WXMSW__
             return new wxBitmap(self->GetBitmap(checked));
         #else
@@ -123,7 +124,8 @@ def run():
         #endif
         """)
 
-    c.find('SetBitmap').setCppCode("""\
+    m = c.find('SetBitmap').findOverload('checked')
+    m.setCppCode("""\
         #ifdef __WXMSW__
             self->SetBitmap(*bmp, checked);
         #else