-/* Copyright (C) 2000, Luca Padovani <luca.padovani@cs.unibo.it>.
+/* Copyright (C) 2000-2003, Luca Padovani <luca.padovani@cs.unibo.it>,
+ * Claudio Sacerdoti Coen <sacerdot@cs.unibo.it>.
*
* This file is part of lablgtkmathview, the Ocaml binding
* for the GtkMathView widget.
#define FontManagerId_val(val) Int_val(val)
#define Val_FontManagerId(val) Val_int(val)
-// As ML_1, but the result is optional
+/* As ML_1, but the result is optional */
#define OML_1(cname, conv1, conv) \
value ml_##cname (value arg1) { return Val_option_ptr((cname (conv1 (arg1))),conv); }
-// As ML_2, but the second argument is optional
+/* As ML_3, but the result is optional */
+#define OML_3(cname, conv1, conv2, conv3, conv) \
+value ml_##cname (value arg1, value arg2, value arg3) { return Val_option_ptr((cname (conv1 (arg1), conv2 (arg2), conv3 (arg3))),conv); }
+/* As ML_2, but the second argument is optional */
#define ML_2O(cname, conv1, conv2, conv) \
value ml_##cname (value arg1, value arg2) \
{ return conv (cname (conv1(arg1), ptr_val_option(arg2,conv2))); }
}
}
+value Val_Element_ref(GdomeElement* elem)
+{
+ if (elem != NULL)
+ {
+ GdomeException exc = 0;
+ gdome_el_ref(elem, &exc);
+ g_assert(exc == 0);
+ }
+ return Val_Element(elem);
+}
+
ML_2 (gtk_math_view_new,GtkAdjustment_val, GtkAdjustment_val, Val_GtkWidget_sink)
ML_1 (gtk_math_view_freeze, GtkMathView_val, Unit)
ML_1 (gtk_math_view_thaw, GtkMathView_val, Unit)
ML_2 (gtk_math_view_select, GtkMathView_val, Element_val, Unit)
ML_2 (gtk_math_view_unselect, GtkMathView_val, Element_val, Unit)
ML_2 (gtk_math_view_is_selected, GtkMathView_val, Element_val, Val_bool)
+OML_3 (gtk_math_view_get_element_at, GtkMathView_val, Int_val, Int_val, Val_Element)
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)
ML_1 (gtk_math_view_get_vadjustment, GtkMathView_val, Val_GtkWidget)
ML_1 (gtk_math_view_get_buffer, GtkMathView_val, Val_GdkPixmap)
ML_1 (gtk_math_view_get_frame, GtkMathView_val, Val_GtkWidget)
+ML_1 (gtk_math_view_get_drawing_area, GtkMathView_val, Val_GtkWidget)
ML_2 (gtk_math_view_set_font_size, GtkMathView_val, Int_val, Unit)
ML_1 (gtk_math_view_get_font_size, GtkMathView_val, Val_int)
ML_2 (gtk_math_view_set_anti_aliasing, GtkMathView_val, Bool_val, Unit)
gtk_math_view_get_top(GtkMathView_val (arg1), &x, &y);
result = alloc(2, 0);
Store_field(result, 0, Val_int(x));
- Store_field(result, 0, Val_int(y));
+ Store_field(result, 1, Val_int(y));
CAMLreturn (result);
}
+/*
+value ml_gtk_math_view_get_element_coords (value arg1, value arg2)
+{
+ CAMLparam2(arg1, arg2);
+ CAMLlocal1 (result);
+ int x, y;
+ gtk_math_view_get_element_coords(GtkMathView_val (arg1), Element_val(arg2), &x, &y);
+ result = alloc(2, 0);
+ Store_field(result, 0, Val_int(x));
+ Store_field(result, 1, Val_int(y));
+ CAMLreturn (result);
+}
+*/
+
value ml_gtk_math_view_gdome_element_of_boxed_option (value arg1)
{
CAMLparam1(arg1);
- GdomeElement* nr;
+ GdomeException exc = 0;
+ GdomeElement* nr = NULL;
CAMLlocal1 (res);
if (arg1==Val_int(0)) {
assert(0);
} else {
- nr = (GdomeElement*) Field(Field(arg1,0), 1);
+ nr = (GdomeElement*) Field(Field(arg1,0),1);
}
- res = Val_Element(nr);
+
+ res = Val_Element_ref(nr);
if (res==Val_int(0)) {
assert(0);
}
if (arg1==Val_int(0)) {
res=Val_unit;
} else {
- res = Val_option_ptr((GdomeElement*) Field(Field(arg1,0),1),Val_Element);
+ GdomeException exc = 0;
+ GdomeElement* elem = (GdomeElement*) Field(Field(arg1,0),1);
+ assert(elem != NULL);
+ res = Val_option_ptr(elem, Val_Element_ref);
}
CAMLreturn(res);
}
+