Lerking/Phoenix
1
0
Fork 0
mirror of https://github.com/wxWidgets/Phoenix.git synced 2026-01-06 20:10:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to latest SIP dev snapshot, and remove the BLACK hack that is no longer needed.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk@69521 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2011-10-24 21:48:30 +00:00
parent 766baba0a6
commit f2864fdc05
5 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bin/build-sip-msw
View File

@@ -35,8 +35,9 @@ echo ""
echo "The MD5:"
$PYTHON mymd5.py sip-$SIPVER-win32.exe
echo ""
echo "Now bzip2 the new sip binary and then scp it to "
echo " robind@riobu.com:/home/robind/domains/wxpython.org/htdocs/tools"
echo "If ready to upload then do these commands now:"
echo " bzip2 $MYBINDIR/sip-$SIPVER-win32.exe"
echo " scp $MYBINDIR/sip-$SIPVER-win32.exe.bz2 robind@riobu.com:/home/robind/domains/wxpython.org/htdocs/tools"
## Reset the *_RELEASE flags to use debug options so the sip executable

5
bin/build-sip-posix
View File

@@ -42,8 +42,9 @@ echo ""
echo "The MD5:"
$PYTHON mymd5.py sip-$SIPVER-$PLATFORM
echo ""
echo "Now bzip2 the new sip binary and then scp it to "
echo " robind@riobu.com:/home/robind/domains/wxpython.org/htdocs/tools"
echo "If ready to upload then do these commands now:"
echo " bzip2 $MYBINDIR/sip-$SIPVER-$PLATFORM"
echo " scp $MYBINDIR/sip-$SIPVER-$PLATFORM.bz2 robind@riobu.com:/home/robind/domains/wxpython.org/htdocs/tools"

8
build.py
View File

@@ -35,11 +35,11 @@ unstable_series = (version.VER_MINOR % 2) == 1 # is the minor version odd or ev
isWindows = sys.platform.startswith('win')
isDarwin = sys.platform == "darwin"
sipCurrentVersion = '4.12.5-snapshot-3a009ee97d60'
sipCurrentVersion = '4.12.5-snapshot-4eba42cb2457'
sipCurrentVersionMD5 = {
'darwin' : '5d8ea39022e8daca219e5dc7752b3ebb',
'win32' : '9e238f429ce2d19cb418aeca1906230c',
'linux2' : 'e5a3a8a0515d17446bf503a9b49951e9',
'darwin' : 'a055c7f4bf1e54b0f7ed5e9da0513f3f',
'win32' : '54002e6de6292a035e5e2d97e1e850e9',
'linux2' : '7aa3d26fbafb605dde389e6d800aeb8b',
}
toolsURL = 'http://wxpython.org/tools'

11
etg/graphics.py
View File

@@ -78,12 +78,6 @@ def run():
# FIXME: Handle wxEnhMetaFileDC?
c.find('Create').findOverload('wxEnhMetaFileDC').ignore()
# SIP doesn't like default parameter values to use dereference syntax,
# (such as "col = *wxBLACK") so tweak the syntax a bit by using a macro.
c.addHeaderCode("#define BLACK *wxBLACK")
for m in c.find('CreateFont').all():
m.find('col').default = 'BLACK'
m = c.find('GetPartialTextExtents')
m.find('widths').ignore()
m.type = 'wxArrayDouble*'
@@ -182,10 +176,7 @@ def run():
# FIXME: Handle wxEnhMetaFileDC?
c.find('CreateContext').findOverload('wxEnhMetaFileDC').ignore()
# See above
for m in c.find('CreateFont').all():
m.find('col').default = 'BLACK'
#---------------------------------------------
c = module.find('wxGraphicsMatrix')
tools.removeVirtuals(c)

2
sip/siplib/sip.h
View File

@@ -55,7 +55,7 @@ extern "C" {
* Define the SIP version number.
*/
#define SIP_VERSION 0x040c05
#define SIP_VERSION_STR "4.12.5-snapshot-3a009ee97d60"
#define SIP_VERSION_STR "4.12.5-snapshot-4eba42cb2457"
/*