From 3925911c9975e148999df9dd0b8106e315e38f15 Mon Sep 17 00:00:00 2001 From: Steve Chaplin Date: Tue, 25 Aug 2009 16:54:01 +0800 Subject: Move tp_base initialization from cairomodule.c back into the class definitions - to become consistent with Python source. --- src/cairomodule.c | 21 --------------------- src/pycairo-context.c | 2 +- src/pycairo-font.c | 8 ++++---- src/pycairo-matrix.c | 2 +- src/pycairo-path.c | 2 +- src/pycairo-pattern.c | 12 ++++++------ src/pycairo-surface.c | 14 +++++++------- 7 files changed, 20 insertions(+), 41 deletions(-) diff --git a/src/cairomodule.c b/src/cairomodule.c index 3d1daca..4c3b2f7 100644 --- a/src/cairomodule.c +++ b/src/cairomodule.c @@ -172,80 +172,59 @@ init_cairo(void) { PyObject *m; - /* initialise 'tp_base' here to work round problem with MinGW compiler */ - PycairoContext_Type.tp_base = &PyBaseObject_Type; if (PyType_Ready(&PycairoContext_Type) < 0) return; - PycairoFontFace_Type.tp_base = &PyBaseObject_Type; if (PyType_Ready(&PycairoFontFace_Type) < 0) return; - PycairoToyFontFace_Type.tp_base = &PycairoFontFace_Type; if (PyType_Ready(&PycairoToyFontFace_Type) < 0) return; - PycairoFontOptions_Type.tp_base = &PyBaseObject_Type; if (PyType_Ready(&PycairoFontOptions_Type) < 0) return; - PycairoMatrix_Type.tp_base = &PyBaseObject_Type; if (PyType_Ready(&PycairoMatrix_Type) < 0) return; - PycairoPath_Type.tp_base = &PyBaseObject_Type; if (PyType_Ready(&PycairoPath_Type) < 0) return; PycairoPathiter_Type.tp_iter=&PyObject_SelfIter; - PycairoPattern_Type.tp_base = &PyBaseObject_Type; if (PyType_Ready(&PycairoPattern_Type) < 0) return; - PycairoSolidPattern_Type.tp_base = &PycairoPattern_Type; if (PyType_Ready(&PycairoSolidPattern_Type) < 0) return; - PycairoSurfacePattern_Type.tp_base = &PycairoPattern_Type; if (PyType_Ready(&PycairoSurfacePattern_Type) < 0) return; - PycairoGradient_Type.tp_base = &PycairoPattern_Type; if (PyType_Ready(&PycairoGradient_Type) < 0) return; - PycairoLinearGradient_Type.tp_base = &PycairoGradient_Type; if (PyType_Ready(&PycairoLinearGradient_Type) < 0) return; - PycairoRadialGradient_Type.tp_base = &PycairoGradient_Type; if (PyType_Ready(&PycairoRadialGradient_Type) < 0) return; - PycairoScaledFont_Type.tp_base = &PyBaseObject_Type; if (PyType_Ready(&PycairoScaledFont_Type) < 0) return; - PycairoSurface_Type.tp_base = &PyBaseObject_Type; if (PyType_Ready(&PycairoSurface_Type) < 0) return; #ifdef CAIRO_HAS_IMAGE_SURFACE - PycairoImageSurface_Type.tp_base = &PycairoSurface_Type; if (PyType_Ready(&PycairoImageSurface_Type) < 0) return; #endif #ifdef CAIRO_HAS_PDF_SURFACE - PycairoPDFSurface_Type.tp_base = &PycairoSurface_Type; if (PyType_Ready(&PycairoPDFSurface_Type) < 0) return; #endif #ifdef CAIRO_HAS_PS_SURFACE - PycairoPSSurface_Type.tp_base = &PycairoSurface_Type; if (PyType_Ready(&PycairoPSSurface_Type) < 0) return; #endif #ifdef CAIRO_HAS_SVG_SURFACE - PycairoSVGSurface_Type.tp_base = &PycairoSurface_Type; if (PyType_Ready(&PycairoSVGSurface_Type) < 0) return; #endif #ifdef CAIRO_HAS_WIN32_SURFACE - PycairoWin32Surface_Type.tp_base = &PycairoSurface_Type; if (PyType_Ready(&PycairoWin32Surface_Type) < 0) return; #endif #ifdef CAIRO_HAS_XLIB_SURFACE - PycairoXlibSurface_Type.tp_base = &PycairoSurface_Type; if (PyType_Ready(&PycairoXlibSurface_Type) < 0) return; #endif diff --git a/src/pycairo-context.c b/src/pycairo-context.c index bbc887a..a5398d1 100644 --- a/src/pycairo-context.c +++ b/src/pycairo-context.c @@ -1432,7 +1432,7 @@ PyTypeObject PycairoContext_Type = { pycairo_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PyBaseObject_Type, */ /* tp_base */ + &PyBaseObject_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ diff --git a/src/pycairo-font.c b/src/pycairo-font.c index d240b46..ee01ec8 100644 --- a/src/pycairo-font.c +++ b/src/pycairo-font.c @@ -133,7 +133,7 @@ PyTypeObject PycairoFontFace_Type = { 0, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PyBaseObject_Type, */ /* tp_base */ + &PyBaseObject_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -238,7 +238,7 @@ PyTypeObject PycairoToyFontFace_Type = { toy_font_face_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PycairoFontFace_Type, */ /* tp_base */ + &PycairoFontFace_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -412,7 +412,7 @@ PyTypeObject PycairoScaledFont_Type = { scaled_font_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PyBaseObject_Type, */ /* tp_base */ + &PyBaseObject_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -597,7 +597,7 @@ PyTypeObject PycairoFontOptions_Type = { font_options_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PyBaseObject_Type, */ /* tp_base */ + &PyBaseObject_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ diff --git a/src/pycairo-matrix.c b/src/pycairo-matrix.c index 8daa6dc..6503c9a 100644 --- a/src/pycairo-matrix.c +++ b/src/pycairo-matrix.c @@ -334,7 +334,7 @@ PyTypeObject PycairoMatrix_Type = { matrix_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PyBaseObject_Type, */ /* tp_base */ + &PyBaseObject_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ diff --git a/src/pycairo-path.c b/src/pycairo-path.c index 53e706f..7fbaed2 100644 --- a/src/pycairo-path.c +++ b/src/pycairo-path.c @@ -208,7 +208,7 @@ PyTypeObject PycairoPath_Type = { 0, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PyBaseObject_Type, */ /* tp_base */ + &PyBaseObject_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ diff --git a/src/pycairo-pattern.c b/src/pycairo-pattern.c index c6f5050..2beda6a 100644 --- a/src/pycairo-pattern.c +++ b/src/pycairo-pattern.c @@ -196,7 +196,7 @@ PyTypeObject PycairoPattern_Type = { pattern_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PyBaseObject_Type, */ /* tp_base */ + &PyBaseObject_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -265,7 +265,7 @@ PyTypeObject PycairoSolidPattern_Type = { solid_pattern_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PyPattern_Type, */ /* tp_base */ + &PycairoPattern_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -357,7 +357,7 @@ PyTypeObject PycairoSurfacePattern_Type = { surface_pattern_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PycairoPattern_Type, */ /* tp_base */ + &PycairoPattern_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -442,7 +442,7 @@ PyTypeObject PycairoGradient_Type = { gradient_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PycairoPattern_Type, */ /* tp_base */ + &PycairoPattern_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -512,7 +512,7 @@ PyTypeObject PycairoLinearGradient_Type = { linear_gradient_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PycairoGradient_Type, */ /* tp_base */ + &PycairoGradient_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -584,7 +584,7 @@ PyTypeObject PycairoRadialGradient_Type = { radial_gradient_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PycairoGradient_Type, */ /* tp_base */ + &PycairoGradient_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ diff --git a/src/pycairo-surface.c b/src/pycairo-surface.c index 71c191a..a0cad36 100644 --- a/src/pycairo-surface.c +++ b/src/pycairo-surface.c @@ -368,7 +368,7 @@ PyTypeObject PycairoSurface_Type = { surface_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PyBaseObject_Type, */ /* tp_base */ + &PyBaseObject_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -645,7 +645,7 @@ PyTypeObject PycairoImageSurface_Type = { image_surface_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PycairoSurface_Type, */ /* tp_base */ + &PycairoSurface_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -759,7 +759,7 @@ PyTypeObject PycairoPDFSurface_Type = { pdf_surface_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PycairoSurface_Type, */ /* tp_base */ + &PycairoSurface_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -952,7 +952,7 @@ PyTypeObject PycairoPSSurface_Type = { ps_surface_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PycairoSurface_Type, */ /* tp_base */ + &PycairoSurface_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -1058,7 +1058,7 @@ PyTypeObject PycairoSVGSurface_Type = { svg_surface_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PycairoSurface_Type, */ /* tp_base */ + &PycairoSurface_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -1123,7 +1123,7 @@ PyTypeObject PycairoWin32Surface_Type = { win32_surface_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PycairoSurface_Type, */ /* tp_base */ + &PycairoSurface_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ @@ -1203,7 +1203,7 @@ PyTypeObject PycairoXlibSurface_Type = { xlib_surface_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ - 0, /* &PycairoSurface_Type, */ /* tp_base */ + &PycairoSurface_Type, /* tp_base */ 0, /* tp_dict */ 0, /* tp_descr_get */ 0, /* tp_descr_set */ -- cgit v1.2.1