From 018208450c5a45d8f0b595a45298daf86404fc25 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 21 Jun 2017 19:01:44 -0700 Subject: [PATCH 1/2] Correctly transfer ownership of the input stream in wxFSFile --- etg/filesys.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etg/filesys.py b/etg/filesys.py index ec976316..48349dd0 100644 --- a/etg/filesys.py +++ b/etg/filesys.py @@ -66,6 +66,8 @@ def run(): c = module.find('wxFSFile') c.addPrivateCopyCtor() + c.find('wxFSFile.stream').transfer = True + c.find('DetachStream').transferBack = True c = module.find('wxFilterFSHandler') _fixHandlerClass(c) From 2f4c7fb02384ea57a98c9c48c612f290d2359da4 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 21 Jun 2017 19:02:25 -0700 Subject: [PATCH 2/2] Mark the GetFile methods in the handler classes as factories --- etg/webview.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/etg/webview.py b/etg/webview.py index fc8057aa..cf045c94 100644 --- a/etg/webview.py +++ b/etg/webview.py @@ -131,6 +131,13 @@ def run(): tools.addAutoProperties(c) + for name in [ 'wxWebViewHandler', + 'wxWebViewArchiveHandler', + 'wxWebViewFSHandler' ]: + c = module.find(name) + c.find('GetFile').factory = True + + #----------------------------------------------------------------- tools.doCommonTweaks(module) tools.runGenerators(module)