[cairo-commit] python-cairo/cairo cairomodule.c,1.3,1.4 pycairo-surface.c,1.2,1.3

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/python-cairo/cairo
In directory pdx:/tmp/cvs-serv23899/cairo

Modified Files:
	cairomodule.c pycairo-surface.c 
Log Message:

        * examples/cairo-demo.py: Add #! magic.

        * examples/cairo-knockout.py: Add #! magic.

        * examples/text.py: Fixed to not call cairo.text_extents since
        cairo_text_extents is not currently working.

        * cairo/pycairo-surface.c: Removed calls to
        cairo_surface_create_similar_solid which no longer exists in
        cairo.

        * cairo/cairomodule.c (init_cairo): Removed DISJOINT/CONJOINT
        operators that are no longer in cairo.


Index: cairomodule.c
===================================================================
RCS file: /cvs/cairo/python-cairo/cairo/cairomodule.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cairomodule.c	28 Oct 2003 15:53:13 -0000	1.3
--- cairomodule.c	14 Nov 2003 15:32:10 -0000	1.4
***************
*** 155,182 ****
      CONSTANT(OPERATOR_ADD);
      CONSTANT(OPERATOR_SATURATE);
-     CONSTANT(OPERATOR_DISJOINT_CLEAR);
-     CONSTANT(OPERATOR_DISJOINT_SRC);
-     CONSTANT(OPERATOR_DISJOINT_DST);
-     CONSTANT(OPERATOR_DISJOINT_OVER);
-     CONSTANT(OPERATOR_DISJOINT_OVER_REVERSE);
-     CONSTANT(OPERATOR_DISJOINT_IN);
-     CONSTANT(OPERATOR_DISJOINT_IN_REVERSE);
-     CONSTANT(OPERATOR_DISJOINT_OUT);
-     CONSTANT(OPERATOR_DISJOINT_OUT_REVERSE);
-     CONSTANT(OPERATOR_DISJOINT_ATOP);
-     CONSTANT(OPERATOR_DISJOINT_ATOP_REVERSE);
-     CONSTANT(OPERATOR_DISJOINT_XOR);
-     CONSTANT(OPERATOR_CONJOINT_CLEAR);
-     CONSTANT(OPERATOR_CONJOINT_SRC);
-     CONSTANT(OPERATOR_CONJOINT_DST);
-     CONSTANT(OPERATOR_CONJOINT_OVER);
-     CONSTANT(OPERATOR_CONJOINT_OVER_REVERSE);
-     CONSTANT(OPERATOR_CONJOINT_IN);
-     CONSTANT(OPERATOR_CONJOINT_IN_REVERSE);
-     CONSTANT(OPERATOR_CONJOINT_OUT);
-     CONSTANT(OPERATOR_CONJOINT_OUT_REVERSE);
-     CONSTANT(OPERATOR_CONJOINT_ATOP);
-     CONSTANT(OPERATOR_CONJOINT_ATOP_REVERSE);
-     CONSTANT(OPERATOR_CONJOINT_XOR);
  
      CONSTANT(FILL_RULE_WINDING);
--- 155,158 ----

Index: pycairo-surface.c
===================================================================
RCS file: /cvs/cairo/python-cairo/cairo/pycairo-surface.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pycairo-surface.c	9 Oct 2003 14:33:23 -0000	1.2
--- pycairo-surface.c	14 Nov 2003 15:32:10 -0000	1.3
***************
*** 54,78 ****
  
  static PyObject *
- pycairo_surface_create_similar_solid(PyCairoSurface *self, PyObject *args)
- {
-     cairo_surface_t *surface;
-     cairo_format_t format;
-     int width, height;
-     double red, green, blue, alpha;
- 
-     if (!PyArg_ParseTuple(args, "iiidddd:Surface.create_similar",
- 			  &format, &width, &height,
- 			  &red, &green, &blue, &alpha))
- 	return NULL;
- 
-     surface = cairo_surface_create_similar_solid(self->surface, format,
- 						 width, height,
- 						 red, green, blue, alpha);
-     if (!surface)
- 	return PyErr_NoMemory();
-     return pycairo_surface_new(surface);
- }
- 
- static PyObject *
  pycairo_surface_set_repeat(PyCairoSurface *self, PyObject *args)
  {
--- 54,57 ----
***************
*** 129,134 ****
      { "create_similar", (PyCFunction)pycairo_surface_create_similar,
        METH_VARARGS },
-     { "create_similar_solid",
-       (PyCFunction)pycairo_surface_create_similar_solid, METH_VARARGS },
      { "set_repeat", (PyCFunction)pycairo_surface_set_repeat, METH_VARARGS },
      { "set_matrix", (PyCFunction)pycairo_surface_set_matrix, METH_VARARGS },
--- 108,111 ----