updated the binding so that it works well with lablgtk-1.00,

[helm.git] / helm / DEVEL / lablgtkmathview / ml_gtk_mathview.c

diff --git a/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c b/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c
index bc7d13528ab211c8e1d175a49456ae01096fe507..5f86ff03c4bc35a057f16159b340b0ac014542ee 100644 (file)
--- a/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c
+++ b/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c
@@ -30,7 +30,7 @@
 #include <caml/callback.h>
 #include <caml/fail.h>
 
-#include <gtkmathview/gtkmathview.h>
+#include <gtkmathview.h>
 #include <ml_gtk.h>
 
 #include <wrappers.h>
@@ -40,10 +40,18 @@
 #include <gtk_tags.h>
 
 #include <minidom.h>
-#include "minidom/ml_minidom.h"
+#include "mlminidom/ml_minidom.h"
 
 /* <CSC/>: Next row should be put in a .h of lablgtk. */
 #define GtkAdjustment_val(val) check_cast(GTK_ADJUSTMENT,val)
+/* <LUCA/>: Next rows too */
+
+extern value Val_GtkObject_sink();
+
+#define Val_GtkAny(w) Val_GtkObject((GtkObject*)w)
+#define Val_GtkAny_sink(w) Val_GtkObject_sink((GtkObject*)w)
+#define Val_GtkWidget Val_GtkAny
+#define Val_GtkWidget_sink Val_GtkAny_sink
 
 #define GtkMathView_val(val) check_cast(GTK_MATH_VIEW,val)
 
@@ -137,22 +145,15 @@ value ml_gtk_math_view_get_top (value arg1)
    CAMLreturn (result);
 }
 
-
-value ml_gtk_math_view_mDOMNode_of_bodex_option (value arg1)
+value ml_gtk_math_view_mDOMNode_of_boxed (value arg1)
 {
    CAMLparam1(arg1);
 
    mDOMNodeRef nr;
-   CAMLlocal1 (tmp);
    CAMLlocal1 (optval);
    CAMLlocal1 (res);
 
-   if (arg1==Val_int(0)) {
-      assert(0);
-   } else {
-      tmp = Field(arg1, 0);
-      nr = (mDOMNodeRef) Field(tmp, 1);
-   }
+   nr = (mDOMNodeRef) Field(arg1, 1);
    optval = Val_mDOMNodeRef(nr);
    if (optval==Val_int(0)) {
       assert(0);
@@ -163,19 +164,13 @@ value ml_gtk_math_view_mDOMNode_of_bodex_option (value arg1)
   CAMLreturn(res);
 }
 
-value ml_gtk_math_view_mDOMNode_option_of_bodex_option (value arg1)
+value ml_gtk_math_view_mDOMNode_option_of_boxed (value arg1)
 {
    CAMLparam1(arg1);
 
    mDOMNodeRef nr;
-   CAMLlocal1 (tmp);
 
-   if (arg1==Val_int(0)) {
-      nr=NULL;
-   } else {
-      tmp = Field(arg1, 0);
-      nr = (mDOMNodeRef) Field(tmp, 1);
-   }
+   nr = (mDOMNodeRef) Field(arg1, 1);
 
-  CAMLreturn(Val_mDOMNodeRef(nr));
+   CAMLreturn(Val_mDOMNodeRef(nr));
 }