...

[helm.git] / helm / DEVEL / lablgtk_gtkmathview / lablgtk-20000829_gtkmathview-0.2.0 / ml_gtk_mathview.c

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 84e21a6c84e0490b4c370e42b0d887025b96e4a6..39f3d74c4c7dc89d47813549fa8a0e17660dc499 100644 (file)
--- 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));
 }