[cairo-commit] rcairo/src cairo.c,1.3,1.4 image.c,1.2,1.3 rbcairo.h,1.1,1.2 xlib.c,1.1,1.2

[Evan Martin]

Committed by: martine

Update of /cvs/cairo/rcairo/src
In directory pdx:/tmp/cvs-serv11993/src

Modified Files:
	cairo.c image.c rbcairo.h xlib.c 
Log Message:
Fix build, add GtkCairo bindings.


Index: cairo.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/cairo.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cairo.c	19 Nov 2003 18:51:51 -0000	1.3
--- cairo.c	25 Nov 2003 04:35:42 -0000	1.4
***************
*** 17,25 ****
  }
  VALUE
! rcairo_new() {
! 	cairo_t *cr = cairo_create();
  	cairo_reference(cr);
  	return Data_Wrap_Struct(cCairo, NULL, cairo_destroy, cr);
  }
  static VALUE
  rcairo_rcairo_new(VALUE class) {
--- 17,29 ----
  }
  VALUE
! rcairo_new_from(cairo_t *cr) {
  	cairo_reference(cr);
  	return Data_Wrap_Struct(cCairo, NULL, cairo_destroy, cr);
  }
+ VALUE
+ rcairo_new() {
+ 	cairo_t *cr = cairo_create();
+ 	return rcairo_new_from(cr);
+ }
  static VALUE
  rcairo_rcairo_new(VALUE class) {

Index: image.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/image.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** image.c	28 Oct 2003 23:31:06 -0000	1.2
--- image.c	25 Nov 2003 04:35:42 -0000	1.3
***************
*** 5,9 ****
   */
  
! #include "shared.h"
  
  VALUE cCairoImage;
--- 5,9 ----
   */
  
! #include "rbcairo.h"
  
  VALUE cCairoImage;

Index: rbcairo.h
===================================================================
RCS file: /cvs/cairo/rcairo/src/rbcairo.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rbcairo.h	19 Nov 2003 23:57:09 -0000	1.1
--- rbcairo.h	25 Nov 2003 04:35:42 -0000	1.2
***************
*** 29,32 ****
--- 29,33 ----
  Display* rcairo_display_get_display(VALUE rdpy);
  
+ VALUE rcairo_new_from(cairo_t *cr);
  VALUE rcairo_new();
  cairo_t* rcairo_get_cairo(VALUE rcairo);

Index: xlib.c
===================================================================
RCS file: /cvs/cairo/rcairo/src/xlib.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** xlib.c	28 Oct 2003 18:27:22 -0000	1.1
--- xlib.c	25 Nov 2003 04:35:42 -0000	1.2
***************
*** 5,9 ****
   */
  
! #include "shared.h"
  
  #include "cairo-xlib.h"
--- 5,9 ----
   */
  
! #include "rbcairo.h"
  
  #include "cairo-xlib.h"