Drop gtkcairo support

* src/Makefile, src*gtkcairo*: drop gtkcairo support.

6 files changed, 2 insertions, 141 deletions

diff --git a/ChangeLog b/ChangeLog
index 92f8305..562562f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* src/cairo_ps.mli, src/cairo_ps.mli, src/ml_cairo_ps.c: add
 	Cairo_ps.set_dpi 
 
+	* src/Makefile, src*gtkcairo*: drop gtkcairo support.
+	
 2005-11-03  Olivier Andrieu  <oliv__a@users.sourceforge.net>
 
 	* configure.ac: require cairo 1.0, bump version number to 1.0
diff --git a/config.make.in b/config.make.in
index a4f0da9..4d36b95 100644
--- a/config.make.in
+++ b/config.make.in
@@ -22,9 +22,6 @@ CAIRO_LIBS   = $(filter-out $(FILT),@CAIRO_LIBS@)
 GDK_CFLAGS = @GDK_CFLAGS@
 GDK_LIBS   = $(filter-out $(FILT),@GDK_LIBS@)
 
-# GTKCAIRO_CFLAGS = @GTKCAIRO_CFLAGS@
-# GTKCAIRO_LIBS   = $(filter-out $(FILT),@GTKCAIRO_LIBS@)
-
 LIBSVG_CAIRO_CFLAGS = @LIBSVG_CAIRO_CFLAGS@
 LIBSVG_CAIRO_LIBS   = @LIBSVG_CAIRO_LIBS@
 
diff --git a/src/Makefile b/src/Makefile
index 45b661e..1565355 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,9 +6,6 @@ CPPFLAGS = -g
 TARGETS = cairo
 ifdef LABLGTKDIR
 TARGETS += lablgtk
-ifdef GTKCAIRO_CFLAGS
-TARGETS += gtkcairo
-endif
 endif
 ifdef LIBSVG_CAIRO_CFLAGS
 TARGETS += svgcairo
@@ -53,15 +50,6 @@ cairo_lablgtk.cmxa : $(call mloptobjs,$(lablgtk_SRC))
 libmlcairo_lablgtk.a dllmlcairo_lablgtk.so : $(call cobjs,$(lablgtk_SRC))
 	$(OCAMLMKLIB) -o cairo_lablgtk -oc mlcairo_lablgtk $^
 
-gtkcairo_SRC = cairo_gtkcairo.mli cairo_gtkcairo.ml ml_cairo_gtkcairo.c
-
-gtkcairo.cma : $(call mlobjs,$(gtkcairo_SRC))
-	$(OCAMLMKLIB) -o gtkcairo -oc mlgtkcairo $^ $(GTKCAIRO_LIBS)
-gtkcairo.cmxa : $(call mloptobjs,$(gtkcairo_SRC))
-	$(OCAMLMKLIB) -o gtkcairo -oc mlgtkcairo $^ $(GTKCAIRO_LIBS)
-libmlgtkcairo.a dllmlgtkcairo.so : $(call cobjs,$(gtkcairo_SRC))
-	$(OCAMLMKLIB) -o gtkcairo -oc mlgtkcairo $^ $(GTKCAIRO_LIBS)
-
 svgcairo_SRC = svg_cairo.mli svg_cairo.ml ml_svg_cairo.c
 
 svg_cairo.cma : $(call mlobjs,$(svgcairo_SRC))
@@ -73,14 +61,10 @@ libmlsvgcairo.a dllmlsvgcairo.so : $(call cobjs,$(svgcairo_SRC))
 
 $(call cobjs,$(cairo_SRC))    : CPPFLAGS+=$(CAIRO_CFLAGS)
 $(call cobjs,$(lablgtk_SRC))  : CPPFLAGS+=$(GDK_CFLAGS) -I$(C_LABLGTKDIR)
-$(call cobjs,$(gtkcairo_SRC)) : CPPFLAGS+=$(GTKCAIRO_CFLAGS) -I$(C_LABLGTKDIR)
 $(call cobjs,$(svgcairo_SRC))  : CPPFLAGS+=$(LIBSVG_CAIRO_CFLAGS)
 $(call mlobjs,$(lablgtk_SRC))  : INCFLAGS=-I $(LABLGTKDIR)
-$(call mlobjs,$(gtkcairo_SRC)) : INCFLAGS=-I $(LABLGTKDIR)
 $(call mlintfs,$(lablgtk_SRC))  : INCFLAGS=-I $(LABLGTKDIR)
-$(call mlintfs,$(gtkcairo_SRC)) : INCFLAGS=-I $(LABLGTKDIR)
 $(call mloptobjs,$(lablgtk_SRC))  : INCFLAGS=-I $(LABLGTKDIR)
-$(call mloptobjs,$(gtkcairo_SRC)) : INCFLAGS=-I $(LABLGTKDIR)
 
 install: all
 	mkdir -p $(DESTDIR)$(INSTALLDIR) $(DESTDIR)$(OCAMLLIB)/stublibs
@@ -96,9 +80,6 @@ endif
 DOCFILES = cairo.mli cairo_bigarray.mli cairo_png.mli cairo_pdf.mli cairo_ps.mli cairo_ft.mli
 ifdef LABLGTKDIR
 DOCFILES += cairo_lablgtk.mli
-ifdef GTKCAIRO_CFLAGS
-DOCFILES += cairo_gtkcairo.mli
-endif
 endif
 ifdef LIBSVG_CAIRO_CFLAGS
 DOCFILES += svg_cairo.mli
diff --git a/src/cairo_gtkcairo.ml b/src/cairo_gtkcairo.ml
deleted file mode 100644
index 7801411..0000000
--- a/src/cairo_gtkcairo.ml
+++ /dev/null
@@ -1,48 +0,0 @@
-(**************************************************************************)
-(*  cairo-ocaml -- Objective Caml bindings for Cairo                      *)
-(*  Copyright © 2004-2005 Olivier Andrieu                                 *)
-(*                                                                        *)
-(*  This code is free software and is licensed under the terms of the     *)
-(*  GNU Lesser General Public License version 2.1 (the "LGPL").           *)
-(**************************************************************************)
-
-type gtkcairo = [Gtk.widget | `gtkcairo]
-
-external gtkcairo_init : unit -> unit = "ml_cairo_gtkcairo_init"
-let init = gtkcairo_init ()
-
-external get_cairo : [>`gtkcairo] Gtk.obj -> Cairo.t = "ml_cairo_gtkcairo_get_cairo"
-
-let paint_sig = {
-  GtkSignal.name       = "paint" ;
-  GtkSignal.classe     = `gtkcairo ;
-  GtkSignal.marshaller = 
-  let m = GtkSignal.marshal1 Gobject.Data.pointer "GtkCairo::paint" in
-  fun cb ->
-    m (function 
-      | None -> raise Gpointer.Null 
-      | Some cairo -> cb (Obj.magic cairo : Cairo.t)) }
-
-class cairo_signals obj = 
-  object (self)
-    inherit GObj.widget_signals_impl obj
-    method paint = self#connect paint_sig
-  end
-
-class cairo obj = 
-  object
-    inherit GObj.widget (obj : [> gtkcairo] Gtk.obj)
-
-    method connect = new cairo_signals obj
-    method event = new GObj.event_ops obj
-    method cairo = get_cairo obj
-    method queue_draw =
-      GtkBase.Widget.queue_draw obj
-  end
-
-let cairo =
-  GtkBase.Widget.size_params []
-    ~cont:(fun pl ?packing ?show () ->
-      GObj.pack_return 
-	(new cairo (GtkObject.make "GtkCairo" pl))
-	~packing ~show)
diff --git a/src/cairo_gtkcairo.mli b/src/cairo_gtkcairo.mli
deleted file mode 100644
index 7a51fa2..0000000
--- a/src/cairo_gtkcairo.mli
+++ /dev/null
@@ -1,37 +0,0 @@
-(**************************************************************************)
-(*  cairo-ocaml -- Objective Caml bindings for Cairo                      *)
-(*  Copyright © 2004-2005 Olivier Andrieu                                 *)
-(*                                                                        *)
-(*  This code is free software and is licensed under the terms of the     *)
-(*  GNU Lesser General Public License version 2.1 (the "LGPL").           *)
-(**************************************************************************)
-
-type gtkcairo = [Gtk.widget | `gtkcairo]
-
-external get_cairo : [> `gtkcairo ] Gtk.obj -> Cairo.t
-  = "ml_cairo_gtkcairo_get_cairo"
-
-class cairo_signals :
-  [> gtkcairo ] Gtk.obj ->
-  object
-    inherit GObj.widget_signals
-    method paint : callback:(Cairo.t -> unit) -> GtkSignal.id
-  end
-
-class cairo :
-  ([> gtkcairo ] as 'a) Gtk.obj ->
-  object
-    inherit GObj.widget
-    val obj : 'a Gtk.obj
-    method connect : cairo_signals
-    method event : GObj.event_ops
-    method cairo : Cairo.t
-    method queue_draw : unit
-  end
-
-val cairo :
-  ?width:int ->
-  ?height:int ->
-  ?packing:(GObj.widget -> unit) ->
-  ?show:bool ->
-  unit -> cairo
diff --git a/src/ml_cairo_gtkcairo.c b/src/ml_cairo_gtkcairo.c
deleted file mode 100644
index f73aeb9..0000000
--- a/src/ml_cairo_gtkcairo.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/**************************************************************************/
-/*  cairo-ocaml -- Objective Caml bindings for Cairo                      */
-/*  Copyright © 2004-2005 Olivier Andrieu                                 */
-/*                                                                        */
-/*  This code is free software and is licensed under the terms of the     */
-/*  GNU Lesser General Public License version 2.1 (the "LGPL").           */
-/**************************************************************************/
-
-#include <gtkcairo.h>
-
-#include <caml/mlvalues.h>
-
-#include "wrappers.h"
-#include "ml_gobject.h"
-
-#include "ml_cairo.h"
-
-CAMLprim value
-ml_cairo_gtkcairo_init (value unit)
-{
-  GType t = gtk_cairo_get_type ();
-  return Val_GType (t);
-}
-
-#define GtkCairo_val(v)  check_cast(GTK_CAIRO, v)
-
-CAMLprim value
-ml_cairo_gtkcairo_get_cairo (value w)
-{
-  GtkCairo *c = GtkCairo_val (w);
-  cairo_t *cr = gtk_cairo_get_cairo (c);
-  cairo_reference (cr);
-  return Val_cairo_t (cr);
-}