From 632dcaba793ebc033ca4b28fcf4147163a62ae7a Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 20 Mar 2017 16:35:21 -0700 Subject: [PATCH 1/3] Need to transfer ownership on the Prepend methods too. --- etg/menu.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/etg/menu.py b/etg/menu.py index 14ab3a7b..b1e87e6a 100644 --- a/etg/menu.py +++ b/etg/menu.py @@ -33,7 +33,8 @@ def run(): # customizing the generated code and docstrings. def addTransferAnnotations(c, arg): - for method in c.findAll('Append') + c.findAll('Insert') + c.findAll('Replace'): + for method in c.findAll('Append') + c.findAll('Insert') + \ + c.findAll('Replace') + c.findAll('Prepend'): arg_def = method.findItem(arg) if arg_def: arg_def.transfer = True @@ -47,6 +48,9 @@ def run(): assert isinstance(c, etgtools.ClassDef) c.mustHaveApp() tools.removeVirtuals(c) + c.find('Prepend.item').name = 'menuItem' + c.find('Prepend.submenu').name = 'subMenu' + addTransferAnnotations(c, 'menuItem') addTransferAnnotations(c, 'subMenu') c.find('AppendSubMenu.submenu').transfer = True From b1b759a17dacf6f021842c2a312390fdec8fe12e Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 13 Feb 2017 17:14:26 -0800 Subject: [PATCH 2/3] Include the MSVC CRT DLLs for Python 3.6 builds too --- build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.py b/build.py index 7b200773..1e31db7c 100755 --- a/build.py +++ b/build.py @@ -1270,7 +1270,7 @@ def copyWxDlls(options): dlls += glob.glob(os.path.join(cairo_root, arch, 'bin', '*.dll')) # For Python 3.5 builds we also need to copy some VC14 redist DLLs - if PYVER == '3.5': + if PYVER in ['3.5', '3.6']: redist_dir = os.path.join( phoenixDir(), 'packaging', 'Py3.5', 'vcredist', arch, 'Microsoft.VC140.CRT', '*.dll') From 20f7f2dadd85fc5298c7fec5871765f53165e80d Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Mon, 20 Mar 2017 14:44:13 -0700 Subject: [PATCH 3/3] fix comment about the PYVER and the vcredist files --- build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.py b/build.py index 1e31db7c..f170fdf2 100755 --- a/build.py +++ b/build.py @@ -1269,7 +1269,7 @@ def copyWxDlls(options): cairo_root = os.path.join(phoenixDir(), 'packaging', 'cairo-msw') dlls += glob.glob(os.path.join(cairo_root, arch, 'bin', '*.dll')) - # For Python 3.5 builds we also need to copy some VC14 redist DLLs + # For Python 3.5 and 3.6 builds we also need to copy some VC14 redist DLLs if PYVER in ['3.5', '3.6']: redist_dir = os.path.join( phoenixDir(), 'packaging', 'Py3.5', 'vcredist',