[cairo-commit] cairo-ocaml/test text.ml, 1.3, 1.4 spline.ml, 1.5, 1.6 knockout.ml, 1.5, 1.6 demo.ml, 1.3, 1.4

[Olivier Andrieu]

Committed by: oandrieu

Update of /cvs/cairo/cairo-ocaml/test
In directory gabe:/tmp/cvs-serv6245/test

Modified Files:
	text.ml spline.ml knockout.ml demo.ml 
Log Message:
* src/*lablgtk*: sync cairo_lablgtk module with the gdk_cairo_* API of GTK+ 2.8.
* test/*: adapt


Index: text.ml
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/test/text.ml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- text.ml	22 May 2005 20:03:15 -0000	1.3
+++ text.ml	13 Dec 2005 22:42:02 -0000	1.4
@@ -66,7 +66,7 @@
 
   Cairo.select_font_face cr "serif" Cairo.FONT_SLANT_NORMAL Cairo.FONT_WEIGHT_NORMAL ;
   Cairo.set_font_size cr 40. ;
-  let { Cairo.font_height = height } as f_ext = 
+  let { Cairo.font_height = height } = 
     Cairo.font_extents cr in
   
   let glyphs =
@@ -125,8 +125,7 @@
   w#connect#destroy GMain.quit ;
 
   let p = GDraw.pixmap ~width ~height ~window:w () in
-  let s = Cairo_lablgtk.surface_create p#pixmap in
-  let cr = Cairo.create s in
+  let cr = Cairo_lablgtk.create p#pixmap in
   draw cr (float width) (float height) ;
   GMisc.pixmap p ~packing:w#add () ;
 

Index: spline.ml
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/test/spline.ml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- spline.ml	22 May 2005 20:03:15 -0000	1.5
+++ spline.ml	13 Dec 2005 22:42:02 -0000	1.6
@@ -115,7 +115,7 @@
 	  
 
 let paint spl =
-  let cr = Cairo.create (Cairo_lablgtk.surface_create spl.pm#pixmap) in
+  let cr = Cairo_lablgtk.create spl.pm#pixmap in
   spl.pm#rectangle ~x:0 ~y:0 
     ~width:spl.width ~height:spl.height ~filled:true () ;
   Cairo.set_source_rgb cr 0. 0. 0. ;

Index: knockout.ml
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/test/knockout.ml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- knockout.ml	18 Jul 2005 19:11:05 -0000	1.5
+++ knockout.ml	13 Dec 2005 22:42:02 -0000	1.6
@@ -103,7 +103,7 @@
   Cairo.paint c
 
 let expose d_area ev =
-  let c = Cairo.create (Cairo_lablgtk.surface_create d_area#misc#window) in
+  let c = Cairo_lablgtk.create d_area#misc#window in
   let allocation = d_area#misc#allocation in
   draw c allocation.Gtk.width allocation.Gtk.height ;
   true

Index: demo.ml
===================================================================
RCS file: /cvs/cairo/cairo-ocaml/test/demo.ml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- demo.ml	22 May 2005 20:03:15 -0000	1.3
+++ demo.ml	13 Dec 2005 22:42:02 -0000	1.4
@@ -64,7 +64,7 @@
     let width, height = px#size in
     px#rectangle ~x:0 ~y:0 ~width ~height ~filled:true ()
   end ;
-  let cr = Cairo.create (Cairo_lablgtk.surface_create px#pixmap) in
+  let cr = Cairo_lablgtk.create px#pixmap in
   Cairo.set_source_rgb cr 1. 1. 1. ;
 
   Cairo.save cr ; begin 
@@ -112,7 +112,7 @@
   let px = GDraw.pixmap ~width:400 ~height:500 ~window:w () in
   begin try redraw px 
   with Cairo.Error _ -> prerr_endline "Cairo is unhappy" end ;
-  let img = GMisc.pixmap px ~packing:w#add () in
+  ignore (GMisc.pixmap px ~packing:w#add ()) ;
   
   w#show () ;
   GMain.main ()