mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-08 04:50:07 +01:00
Update to doxygen 1.8.2
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@72899 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
8
build.py
8
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
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user