diff --git a/build.py b/build.py index cd501fd3..6004cabd 100755 --- a/build.py +++ b/build.py @@ -64,11 +64,11 @@ sipMD5 = { wafCurrentVersion = '1.6.11' wafMD5 = '9a631fda1e570da8e4813faf9f3c49a4' -doxygenCurrentVersion = '1.7.4' +doxygenCurrentVersion = '1.8.2' doxygenMD5 = { - 'darwin' : 'dbb76a5317ab1fe9b8d77683b726250e', - 'win32' : 'b9882b83ec63cc816b91bd7dd05facdc', - 'linux2' : '8cb4ef98775046428a70737fd0aa3a19', + 'darwin' : '96a3012d97893f4e05387cda544de0e8', + 'win32' : '71f97ebaa87171c824a7742de5bf3381', + 'linux2' : '6fca3d2016f8019a7737716eee4d5377', } # And the location where they can be downloaded from diff --git a/buildtools/config.py b/buildtools/config.py index f276868f..6f734c14 100644 --- a/buildtools/config.py +++ b/buildtools/config.py @@ -777,7 +777,7 @@ def runcmd(cmd, getOutput=False, echoCmd=True, fatal=True): otherKwArgs = dict(stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - sp = subprocess.Popen(cmd, shell=True, **otherKwArgs) + sp = subprocess.Popen(cmd, shell=True, env=os.environ, **otherKwArgs) output = None if getOutput: diff --git a/etg/brush.py b/etg/brush.py index 3987be85..c5cac0b2 100644 --- a/etg/brush.py +++ b/etg/brush.py @@ -73,7 +73,10 @@ def run(): item.ignore() pycode += '%s = Brush()\n' % tools.removeWxPrefix(item.name) module.addPyCode(pycode) - + + + c = module.find('wxBrushList') + c.bases = ['wxObject'] # it is delay-initialized, see stockgdi.sip module.find('wxTheBrushList').ignore() diff --git a/etg/font.py b/etg/font.py index 918f1947..1c7354eb 100644 --- a/etg/font.py +++ b/etg/font.py @@ -122,6 +122,11 @@ def run(): wx.SLANT = int(wx.FONTSTYLE_SLANT) """) + + c = module.find('wxFontList') + c.bases = ['wxObject'] + + #----------------------------------------------------------------- tools.doCommonTweaks(module) tools.runGenerators(module) diff --git a/etg/image.py b/etg/image.py index 19ed400b..a5f308f2 100644 --- a/etg/image.py +++ b/etg/image.py @@ -546,6 +546,7 @@ def run(): #------------------------------------------------------- c = module.find('wxImageHistogram') + c.bases = ['wxObject'] setParamsPyInt('MakeKey') c.find('FindFirstUnusedColour').type = 'void' c.find('FindFirstUnusedColour.r').pyInt = True