wok-next diff wxpython/stuff/wxpython-cairo.patch @ rev 17614

Up scons 2.3.4
author Alexander Medvedev <devl547@gmail.com>
date Thu Feb 12 19:32:03 2015 +0000 (2015-02-12)
parents
children
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/wxpython/stuff/wxpython-cairo.patch	Thu Feb 12 19:32:03 2015 +0000
     1.3 @@ -0,0 +1,51 @@
     1.4 +--- wxPython/trunk/wx/lib/wxcairo.py	2011/08/25 18:50:02	68894
     1.5 ++++ wxPython/trunk/wx/lib/wxcairo.py	2011/09/22 00:30:25	69181
     1.6 +@@ -401,6 +401,48 @@
     1.7 +                                                       ctypes.py_object)),
     1.8 +             ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))]
     1.9 +
    1.10 ++    # This structure is known good with pycairo 1.10.0. The keep adding stuff
    1.11 ++    # to the middle of the structure instead of only adding to the end!
    1.12 ++    elif cairo.version_info < (1,11):
    1.13 ++        _fields_ = [
    1.14 ++            ('Context_Type', ctypes.py_object),
    1.15 ++            ('Context_FromContext', ctypes.PYFUNCTYPE(ctypes.py_object,
    1.16 ++                                                      ctypes.c_void_p,
    1.17 ++                                                      ctypes.py_object,
    1.18 ++                                                      ctypes.py_object)),
    1.19 ++            ('FontFace_Type', ctypes.py_object),
    1.20 ++            ('ToyFontFace_Type', ctypes.py_object),  #** new in 1.8.4
    1.21 ++            ('FontFace_FromFontFace', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
    1.22 ++            ('FontOptions_Type', ctypes.py_object),
    1.23 ++            ('FontOptions_FromFontOptions', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
    1.24 ++            ('Matrix_Type', ctypes.py_object),
    1.25 ++            ('Matrix_FromMatrix', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
    1.26 ++            ('Path_Type', ctypes.py_object),
    1.27 ++            ('Path_FromPath', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
    1.28 ++            ('Pattern_Type', ctypes.py_object),
    1.29 ++            ('SolidPattern_Type', ctypes.py_object),
    1.30 ++            ('SurfacePattern_Type', ctypes.py_object),
    1.31 ++            ('Gradient_Type', ctypes.py_object),
    1.32 ++            ('LinearGradient_Type', ctypes.py_object),
    1.33 ++            ('RadialGradient_Type', ctypes.py_object),
    1.34 ++            ('Pattern_FromPattern', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p,
    1.35 ++                                                      ctypes.py_object)), #** changed in 1.8.4
    1.36 ++            ('ScaledFont_Type', ctypes.py_object),
    1.37 ++            ('ScaledFont_FromScaledFont', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
    1.38 ++            ('Surface_Type', ctypes.py_object),
    1.39 ++            ('ImageSurface_Type', ctypes.py_object),
    1.40 ++            ('PDFSurface_Type', ctypes.py_object),
    1.41 ++            ('PSSurface_Type', ctypes.py_object),
    1.42 ++            ('SVGSurface_Type', ctypes.py_object),
    1.43 ++            ('Win32Surface_Type', ctypes.py_object),
    1.44 ++            ('Win32PrintingSurface_Type', ctypes.py_object),
    1.45 ++            ('XCBSurface_Type', ctypes.py_object),
    1.46 ++            ('XlibSurface_Type', ctypes.py_object),
    1.47 ++            ('Surface_FromSurface', ctypes.PYFUNCTYPE(ctypes.py_object,
    1.48 ++                                                      ctypes.c_void_p,
    1.49 ++                                                      ctypes.py_object)),
    1.50 ++            ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))]
    1.51 ++
    1.52 +
    1.53 + def _loadPycairoAPI():
    1.54 +     global pycairoAPI