Windows build fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69123 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

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()
                 

etg/brush.py

@@ -51,7 +51,6 @@ def run():
         #else
             wxPyRaiseNotImplemented(); 
             _isErr = 1;
-            return NULL; 
         #endif
         """)
 

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 = []