[cairo-commit] pycairo/cairo pycairo.h, 1.6, 1.7 pycairo-private.h, 1.4, 1.5 cairomodule.c, 1.6, 1.7

[Steve Chaplin]

Committed by: stevech1097

Update of /cvs/cairo/pycairo/cairo
In directory gabe:/tmp/cvs-serv21943/cairo

Modified Files:
	pycairo.h pycairo-private.h cairomodule.c 
Log Message:
SC 24/11/2004

Index: pycairo.h
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pycairo.h	14 Nov 2004 15:18:59 -0000	1.6
+++ pycairo.h	24 Nov 2004 02:16:28 -0000	1.7
@@ -40,7 +40,7 @@
     PyTypeObject *font_type;
     PyObject *(* font_new)(cairo_font_t *font);
     PyTypeObject *context_type;
-    PyObject *(* context_new)(cairo_t *ctx);
+    PyObject *(* context_wrap)(cairo_t *ctx);
     PyTypeObject *pattern_type;
     PyObject *(* pattern_wrap)(cairo_pattern_t *pattern);
 };
@@ -54,16 +54,16 @@
 #endif
 
 #define pycairo_check_status (_PyCairo_API->check_status)
-#define PyCairoMatrix_Type *(_PyCairo_API->matrix_type)
-#define pycairo_matrix_new  (_PyCairo_API->matrix_new)
+#define PyCairoMatrix_Type  *(_PyCairo_API->matrix_type)
+#define pycairo_matrix_new   (_PyCairo_API->matrix_new)
 #define PyCairoSurface_Type *(_PyCairo_API->surface_type)
 #define pycairo_surface_new  (_PyCairo_API->surface_new)
-#define PyCairoFont_Type *(_PyCairo_API->font_type)
-#define pycairo_font_new  (_PyCairo_API->font_new)
+#define PyCairoFont_Type    *(_PyCairo_API->font_type)
+#define pycairo_font_new     (_PyCairo_API->font_new)
 #define PyCairoContext_Type *(_PyCairo_API->context_type)
-#define pycairo_context_new  (_PyCairo_API->context_new)
+#define pycairo_context_wrap (_PyCairo_API->context_wrap)
 #define PyCairoPattern_Type *(_PyCairo_API->pattern_type)
-#define pycairo_pattern_new  (_PyCairo_API->pattern_new)
+#define pycairo_pattern_wrap (_PyCairo_API->pattern_wrap)
 
 #define init_pycairo() { \
     PyObject *pycairo = PyImport_ImportModule("cairo._cairo"); \

Index: pycairo-private.h
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-private.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pycairo-private.h	14 Nov 2004 13:04:00 -0000	1.4
+++ pycairo-private.h	24 Nov 2004 02:16:28 -0000	1.5
@@ -19,7 +19,7 @@
 
 /* takes ownership of reference */
 PyObject *pycairo_matrix_new(cairo_matrix_t *matrix);
-PyObject *pycairo_context_new(cairo_t *ctx);
+PyObject *pycairo_context_wrap(cairo_t *ctx);
 PyObject *pycairo_surface_new(cairo_surface_t *surface);
 PyObject *pycairo_pattern_wrap(cairo_pattern_t *pattern);
 PyObject *pycairo_font_new(cairo_font_t *font);

Index: cairomodule.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/cairomodule.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cairomodule.c	14 Nov 2004 13:04:00 -0000	1.6
+++ cairomodule.c	24 Nov 2004 02:16:28 -0000	1.7
@@ -177,7 +177,7 @@
     &PyCairoFont_Type,
     pycairo_font_new,
     &PyCairoContext_Type,
-    pycairo_context_new,
+    pycairo_context_wrap,
     &PyCairoPattern_Type,
     pycairo_pattern_wrap,
 };