[cairo-commit] pycairo/cairo cairomodule.c, 1.33, 1.34 pycairo-font.c, 1.16, 1.17 pycairo-matrix.c, 1.17, 1.18 pycairo-pattern.c, 1.20, 1.21 pycairo-surface.c, 1.37, 1.38 cairogtkmodule.c, 1.20, 1.21

[Steve Chaplin]

Committed by: stevech1097

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

Modified Files:
	cairomodule.c pycairo-font.c pycairo-matrix.c 
	pycairo-pattern.c pycairo-surface.c cairogtkmodule.c 
Log Message:
SC

Index: cairomodule.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/cairomodule.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- cairomodule.c	10 May 2005 15:34:03 -0000	1.33
+++ cairomodule.c	14 May 2005 01:26:31 -0000	1.34
@@ -28,6 +28,8 @@
  * the specific language governing rights and limitations.
  */
 
+#include <Python.h>
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif

Index: pycairo-font.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-font.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- pycairo-font.c	12 May 2005 00:00:08 -0000	1.16
+++ pycairo-font.c	14 May 2005 01:26:31 -0000	1.17
@@ -28,6 +28,8 @@
  * the specific language governing rights and limitations.
  */
 
+#include <Python.h>
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif

Index: pycairo-matrix.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-matrix.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- pycairo-matrix.c	12 May 2005 00:00:08 -0000	1.17
+++ pycairo-matrix.c	14 May 2005 01:26:31 -0000	1.18
@@ -28,6 +28,8 @@
  * the specific language governing rights and limitations.
  */
 
+#include <Python.h>
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif

Index: pycairo-pattern.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-pattern.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- pycairo-pattern.c	12 May 2005 00:00:08 -0000	1.20
+++ pycairo-pattern.c	14 May 2005 01:26:31 -0000	1.21
@@ -28,6 +28,8 @@
  * the specific language governing rights and limitations.
  */
 
+#include <Python.h>
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif

Index: pycairo-surface.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/pycairo-surface.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- pycairo-surface.c	12 May 2005 00:00:08 -0000	1.37
+++ pycairo-surface.c	14 May 2005 01:26:31 -0000	1.38
@@ -28,11 +28,24 @@
  * the specific language governing rights and limitations.
  */
 
+#include <Python.h>
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
+
 #include "pycairo-private.h"
 
+#ifdef CAIRO_HAS_PDF_SURFACE
+#  include <cairo-pdf.h>
+#endif
+/* PS backend support has been removed - the C API is broken
+#ifdef CAIRO_HAS_PS_SURFACE
+# include <cairo-ps.h>
+#endif
+*/
+
+
 #ifdef HAVE_NUMPY
 #  include <Numeric/arrayobject.h>
    static int load_numpy(void);

Index: cairogtkmodule.c
===================================================================
RCS file: /cvs/cairo/pycairo/cairo/cairogtkmodule.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cairogtkmodule.c	10 May 2005 00:55:39 -0000	1.20
+++ cairogtkmodule.c	14 May 2005 01:26:31 -0000	1.21
@@ -28,15 +28,25 @@
  * the specific language governing rights and limitations.
  */
 
+#include <Python.h>
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
-#include "pycairo.h"
-#include <cairo-xlib.h>
-
 #include <pygtk/pygtk.h>
 #include <gdk/gdkx.h>
 
+#include "pycairo.h"
+
+#ifdef CAIRO_HAS_XLIB_SURFACE
+#  include <cairo-xlib.h>
+#else
+#  error "Cairo was not compiled with support for the xlib backend"
+#endif
+
+
+static Pycairo_CAPI_t *Pycairo_CAPI;
+
 static PyTypeObject *_PyGdkDrawable_Type;
 #define PyGdkDrawable_Type (*_PyGdkDrawable_Type)
 static PyTypeObject *_PyGdkPixbuf_Type;
@@ -151,6 +161,7 @@
     { NULL, NULL, 0 }
 };
 
+
 DL_EXPORT(void)
 initgtk(void)
 {