diff --git a/bin/build-sip-msw b/bin/build-sip-msw index 3802149a..db6e4950 100644 --- a/bin/build-sip-msw +++ b/bin/build-sip-msw @@ -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 diff --git a/bin/build-sip-posix b/bin/build-sip-posix index 95015a67..0a46169c 100755 --- a/bin/build-sip-posix +++ b/bin/build-sip-posix @@ -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" diff --git a/build.py b/build.py index f08186a1..929d192b 100755 --- a/build.py +++ b/build.py @@ -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' diff --git a/etg/graphics.py b/etg/graphics.py index ad41908f..57ecaa01 100644 --- a/etg/graphics.py +++ b/etg/graphics.py @@ -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) diff --git a/sip/siplib/sip.h b/sip/siplib/sip.h index 5783721b..b15c8df5 100644 --- a/sip/siplib/sip.h +++ b/sip/siplib/sip.h @@ -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" /*