From: Claudio Sacerdoti Coen <claudio.sacerdoticoen@unibo.it>
Date: Wed, 8 Nov 2000 16:53:30 +0000 (+0000)
Subject: Binding completed and tested. Makefile still to do.
X-Git-Tag: nogzip~194
X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;ds=sidebyside;h=bc14c3b3f2615a9a207412c8738098d8e8eee00a;p=helm.git

Binding completed and tested. Makefile still to do.
---

diff --git a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/Makefile b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/Makefile
index de7e7233b..c64b0496b 100644
--- a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/Makefile
+++ b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/Makefile
@@ -30,7 +30,7 @@ test.opt: test.cmx minidom.cmi ml_minidom.o
         -cclib "`gtkmathview-config --libs`"
 
 clean:
-	rm -f *.o *.cm? test
+	rm -f *.o *.cm? test test.opt
 
 cleanbak:
 	rm -f *~
diff --git a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/ml_minidom.h b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/ml_minidom.h
index c40060153..cf1be3a4a 100644
--- a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/ml_minidom.h
+++ b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/ml_minidom.h
@@ -5,6 +5,6 @@
 #define mDOMNode_val(v) ((mDOMNodeRef) v)
 
 #define mDOMNode_option_mDOMNodeRef(p) (((p) != NULL) ? ml_some((value) (p)) : Val_unit)
-#define mDOMNodeRef_mDOMNode_option(v) (((v) == Val_unit) ? NULL : Field((v),0))
-#define Val_mDOMNodeRef(p)             ((value) mDOMNode_option_mDOMNodeRef(p))
-#define mDOMNodeRef_val(v)             ((mDOMNodeRef) mDOMNodeRef_mDOMNode_option(v))
+#define mDOMNodeRef_mDOMNode_option(v) ((v == Val_unit) ? NULL : (mDOMNodeRef)Field((v),0))
+#define Val_mDOMNodeRef(p)             (mDOMNode_option_mDOMNodeRef(p))
+#define mDOMNodeRef_val(v)             (mDOMNodeRef_mDOMNode_option(v))
diff --git a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/test.opt b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/test.opt
deleted file mode 100755
index 20307125b..000000000
Binary files a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/minidom/test.opt and /dev/null differ
diff --git a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/ml_gtk_mathview.c b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/ml_gtk_mathview.c
index 84e21a6c8..39f3d74c4 100644
--- a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/ml_gtk_mathview.c
+++ b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/ml_gtk_mathview.c
@@ -26,8 +26,8 @@ ML_3 (gtk_math_view_new,GtkAdjustment_val, GtkAdjustment_val, Bool_val, Val_GtkW
 ML_2 (gtk_math_view_load, GtkMathView_val, String_val, Val_bool)
 ML_1 (gtk_math_view_unload, GtkMathView_val, Unit)
 /*ML_1 (gtk_math_view_dump, GtkMathView_val, Unit)*/
-ML_1 (gtk_math_view_get_selection, GtkMathView_val, Val_mDOMNode_option)
-ML_2 (gtk_math_view_set_selection, GtkMathView_val, mDOMNode_option_val, Unit)
+ML_1 (gtk_math_view_get_selection, GtkMathView_val, Val_mDOMNodeRef)
+ML_2 (gtk_math_view_set_selection, GtkMathView_val, mDOMNodeRef_val, Unit)
 ML_1 (gtk_math_view_get_width, GtkMathView_val, Val_int)
 ML_1 (gtk_math_view_get_height, GtkMathView_val, Val_int)
 ML_3 (gtk_math_view_set_top, GtkMathView_val, Int_val, Int_val, Unit)
@@ -83,6 +83,8 @@ value ml_gtk_math_view_mDOMNode_of_bodex_option (value arg1)
 
    mDOMNodeRef nr;
    CAMLlocal1 (tmp);
+   CAMLlocal1 (optval);
+   CAMLlocal1 (res);
 
    if (arg1==Val_int(0)) {
       assert(0);
@@ -90,8 +92,14 @@ value ml_gtk_math_view_mDOMNode_of_bodex_option (value arg1)
       tmp = Field(arg1, 0);
       nr = (mDOMNodeRef) Field(tmp, 1);
    }
+   optval = Val_mDOMNodeRef(nr);
+   if (optval==Val_int(0)) {
+      assert(0);
+   } else {
+      res = Field(optval, 0);
+   }
 
-  CAMLreturn((value) nr);
+  CAMLreturn(res);
 }
 
 value ml_gtk_math_view_mDOMNode_option_of_bodex_option (value arg1)
@@ -102,11 +110,11 @@ value ml_gtk_math_view_mDOMNode_option_of_bodex_option (value arg1)
    CAMLlocal1 (tmp);
 
    if (arg1==Val_int(0)) {
-      nr = NULL;
+      nr=NULL;
    } else {
       tmp = Field(arg1, 0);
       nr = (mDOMNodeRef) Field(tmp, 1);
    }
 
-  CAMLreturn(Val_option(nr, Val_ptr));
+  CAMLreturn(Val_mDOMNodeRef(nr));
 }
diff --git a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/test/test.ml b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/test/test.ml
index 1550a0642..af65d7485 100644
--- a/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/test/test.ml
+++ b/helm/DEVEL/lablgtk_gtkmathview/lablgtk-20000829_gtkmathview-0.2.0/test/test.ml
@@ -9,15 +9,6 @@
 (* Callbacks *)
 let jump node =
  let module M = Minidom in
-  print_string ("jump: " ^
-   (match
-     M.node_get_attribute_ns node
-      (M.mDOMString_of_string "xlink")
-      (M.mDOMString_of_string "href")
-    with
-       None   -> "DOES NOT WORKS (if you have clicked on the hyperlink)!!!!!" 
-     | Some s -> M.string_of_mDOMString s
-   ) ^ "\n");
   print_string ("jump: " ^
    (match
      M.node_get_attribute node