wok-current annotate wxpython/stuff/wxpython-cairo.patch @ rev 13096

Up: octave to 3.6.2.
author Christopher Rogers <slaxemulator@gmail.com>
date Tue Jun 26 15:17:15 2012 +0000 (2012-06-26)
parents
children
rev   line source
slaxemulator@12327 1 --- wxPython/trunk/wx/lib/wxcairo.py 2011/08/25 18:50:02 68894
slaxemulator@12327 2 +++ wxPython/trunk/wx/lib/wxcairo.py 2011/09/22 00:30:25 69181
slaxemulator@12327 3 @@ -401,6 +401,48 @@
slaxemulator@12327 4 ctypes.py_object)),
slaxemulator@12327 5 ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))]
slaxemulator@12327 6
slaxemulator@12327 7 + # This structure is known good with pycairo 1.10.0. The keep adding stuff
slaxemulator@12327 8 + # to the middle of the structure instead of only adding to the end!
slaxemulator@12327 9 + elif cairo.version_info < (1,11):
slaxemulator@12327 10 + _fields_ = [
slaxemulator@12327 11 + ('Context_Type', ctypes.py_object),
slaxemulator@12327 12 + ('Context_FromContext', ctypes.PYFUNCTYPE(ctypes.py_object,
slaxemulator@12327 13 + ctypes.c_void_p,
slaxemulator@12327 14 + ctypes.py_object,
slaxemulator@12327 15 + ctypes.py_object)),
slaxemulator@12327 16 + ('FontFace_Type', ctypes.py_object),
slaxemulator@12327 17 + ('ToyFontFace_Type', ctypes.py_object), #** new in 1.8.4
slaxemulator@12327 18 + ('FontFace_FromFontFace', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
slaxemulator@12327 19 + ('FontOptions_Type', ctypes.py_object),
slaxemulator@12327 20 + ('FontOptions_FromFontOptions', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
slaxemulator@12327 21 + ('Matrix_Type', ctypes.py_object),
slaxemulator@12327 22 + ('Matrix_FromMatrix', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
slaxemulator@12327 23 + ('Path_Type', ctypes.py_object),
slaxemulator@12327 24 + ('Path_FromPath', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
slaxemulator@12327 25 + ('Pattern_Type', ctypes.py_object),
slaxemulator@12327 26 + ('SolidPattern_Type', ctypes.py_object),
slaxemulator@12327 27 + ('SurfacePattern_Type', ctypes.py_object),
slaxemulator@12327 28 + ('Gradient_Type', ctypes.py_object),
slaxemulator@12327 29 + ('LinearGradient_Type', ctypes.py_object),
slaxemulator@12327 30 + ('RadialGradient_Type', ctypes.py_object),
slaxemulator@12327 31 + ('Pattern_FromPattern', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p,
slaxemulator@12327 32 + ctypes.py_object)), #** changed in 1.8.4
slaxemulator@12327 33 + ('ScaledFont_Type', ctypes.py_object),
slaxemulator@12327 34 + ('ScaledFont_FromScaledFont', ctypes.PYFUNCTYPE(ctypes.py_object, ctypes.c_void_p)),
slaxemulator@12327 35 + ('Surface_Type', ctypes.py_object),
slaxemulator@12327 36 + ('ImageSurface_Type', ctypes.py_object),
slaxemulator@12327 37 + ('PDFSurface_Type', ctypes.py_object),
slaxemulator@12327 38 + ('PSSurface_Type', ctypes.py_object),
slaxemulator@12327 39 + ('SVGSurface_Type', ctypes.py_object),
slaxemulator@12327 40 + ('Win32Surface_Type', ctypes.py_object),
slaxemulator@12327 41 + ('Win32PrintingSurface_Type', ctypes.py_object),
slaxemulator@12327 42 + ('XCBSurface_Type', ctypes.py_object),
slaxemulator@12327 43 + ('XlibSurface_Type', ctypes.py_object),
slaxemulator@12327 44 + ('Surface_FromSurface', ctypes.PYFUNCTYPE(ctypes.py_object,
slaxemulator@12327 45 + ctypes.c_void_p,
slaxemulator@12327 46 + ctypes.py_object)),
slaxemulator@12327 47 + ('Check_Status', ctypes.PYFUNCTYPE(ctypes.c_int, ctypes.c_int))]
slaxemulator@12327 48 +
slaxemulator@12327 49
slaxemulator@12327 50 def _loadPycairoAPI():
slaxemulator@12327 51 global pycairoAPI