X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2Fml_gtk_mathview.c;h=54d2dd217cd65e6f4d74c3dade429bd4592bbc3f;hb=21cff2a40a629fd6543403f61ef8da0591711cf9;hp=5f86ff03c4bc35a057f16159b340b0ac014542ee;hpb=4a97b3700b140024e1783ac12501ad5dfa4be9b5;p=helm.git diff --git a/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c b/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c index 5f86ff03c..54d2dd217 100644 --- a/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c +++ b/helm/DEVEL/lablgtkmathview/ml_gtk_mathview.c @@ -44,14 +44,6 @@ /* : Next row should be put in a .h of lablgtk. */ #define GtkAdjustment_val(val) check_cast(GTK_ADJUSTMENT,val) -/* : 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) @@ -145,15 +137,22 @@ value ml_gtk_math_view_get_top (value arg1) CAMLreturn (result); } -value ml_gtk_math_view_mDOMNode_of_boxed (value arg1) + +value ml_gtk_math_view_mDOMNode_of_bodex_option (value arg1) { CAMLparam1(arg1); mDOMNodeRef nr; + CAMLlocal1 (tmp); CAMLlocal1 (optval); CAMLlocal1 (res); - nr = (mDOMNodeRef) Field(arg1, 1); + if (arg1==Val_int(0)) { + assert(0); + } else { + tmp = Field(arg1, 0); + nr = (mDOMNodeRef) Field(tmp, 1); + } optval = Val_mDOMNodeRef(nr); if (optval==Val_int(0)) { assert(0); @@ -164,13 +163,19 @@ value ml_gtk_math_view_mDOMNode_of_boxed (value arg1) CAMLreturn(res); } -value ml_gtk_math_view_mDOMNode_option_of_boxed (value arg1) +value ml_gtk_math_view_mDOMNode_option_of_bodex_option (value arg1) { CAMLparam1(arg1); mDOMNodeRef nr; + CAMLlocal1 (tmp); - nr = (mDOMNodeRef) Field(arg1, 1); + if (arg1==Val_int(0)) { + nr=NULL; + } else { + tmp = Field(arg1, 0); + nr = (mDOMNodeRef) Field(tmp, 1); + } - CAMLreturn(Val_mDOMNodeRef(nr)); + CAMLreturn(Val_mDOMNodeRef(nr)); }