diff --git a/build.py b/build.py index e98b89b9..5a31755c 100755 --- a/build.py +++ b/build.py @@ -394,18 +394,18 @@ def sip(options, args): shutil.copy2(src, dest) continue - with file(src, 'rb') as f: + with file(src, 'rt') as f: srcTxt = f.read() srcTxt = srcTxt.replace(tmpdir, cfg.SIPOUT) # TODO remove lines starting with '#line'? - with file(dest, 'rb') as f: + with file(dest, 'rt') as f: destTxt = f.read() if srcTxt == destTxt: pass else: msg('%s is changed, copying...' % os.path.basename(src)) - f = file(dest, 'wb') + f = file(dest, 'wt') f.write(srcTxt) f.close() diff --git a/etg/brush.py b/etg/brush.py index 8f4876f7..62a4f26e 100644 --- a/etg/brush.py +++ b/etg/brush.py @@ -51,7 +51,6 @@ def run(): #else wxPyRaiseNotImplemented(); _isErr = 1; - return NULL; #endif """) diff --git a/etg/textctrl.py b/etg/textctrl.py index ae22558d..7610b7e5 100644 --- a/etg/textctrl.py +++ b/etg/textctrl.py @@ -44,6 +44,7 @@ def run(): c = module.find('wxTextEntry') c.abstract = True + tools.removeVirtuals(c) c = module.find('wxTextCtrl') c.find('HitTest').overloads = []