X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2FgtkMathView.ml;h=f4edcf588bc4ec83d9a02d7554db336847be3cc4;hb=faf311442f59ccbc652c7965d23ed2945fd40906;hp=3eefbd6defab7af0913bba025176ae007635dbf0;hpb=4a97b3700b140024e1783ac12501ad5dfa4be9b5;p=helm.git

diff --git a/helm/DEVEL/lablgtkmathview/gtkMathView.ml b/helm/DEVEL/lablgtkmathview/gtkMathView.ml
index 3eefbd6de..f4edcf588 100644
--- a/helm/DEVEL/lablgtkmathview/gtkMathView.ml
+++ b/helm/DEVEL/lablgtkmathview/gtkMathView.ml
@@ -24,15 +24,15 @@ open Gtk
 open Gtk_mathview
 open Tags
 open GtkBase
-open Misc
+open Gpointer
 
-external mDOMNode_of_boxed :
- Misc.pointer -> Minidom.mDOMNode =
-  "ml_gtk_math_view_mDOMNode_of_boxed"
+external mDOMNode_of_boxed_option :
+ Gpointer.boxed option -> Minidom.mDOMNode =
+  "ml_gtk_math_view_mDOMNode_of_bodex_option"
 
-external mDOMNode_option_of_boxed :
- Misc.pointer -> Minidom.mDOMNode option =
-  "ml_gtk_math_view_mDOMNode_option_of_boxed"
+external mDOMNode_option_of_boxed_option :
+ Gpointer.boxed option -> Minidom.mDOMNode option =
+  "ml_gtk_math_view_mDOMNode_option_of_bodex_option"
 
 let o_mDOMNode_of_mDOMNode node = new Ominidom.o_mDOMNode node
 
@@ -82,7 +82,7 @@ module MathView = struct
    "ml_gtk_math_view_get_vadjustment"
   external get_buffer : [>`math_view] obj -> Gdk.pixmap =
    "ml_gtk_math_view_get_buffer"
-  external get_frame : [>`math_view] obj -> [`frame] obj =
+  external get_frame : [>`math_view] obj -> Gtk.frame obj =
    "ml_gtk_math_view_get_frame"
   external set_font_size : [>`math_view] obj -> int -> unit =
    "ml_gtk_math_view_set_font_size"
@@ -114,26 +114,26 @@ module MathView = struct
     open GtkSignal
 
     let clicked : ([>`math_view],_) t =
-     let marshal_clicked f argv =
-      match GtkArgv.get_pointer argv ~pos:0 with
-	 Some p -> f (o_mDOMNode_of_mDOMNode (mDOMNode_of_boxed (Obj.magic p)))
+     let marshal_clicked f _ =
+      function
+         [GtkArgv.POINTER node] -> f (o_mDOMNode_of_mDOMNode (mDOMNode_of_boxed_option node))
        | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_clicked"
      in
       { name = "clicked"; marshaller = marshal_clicked }
 
     let jump : ([>`math_view],_) t =
-     let marshal_jump f argv =
-      match GtkArgv.get_pointer argv ~pos:0 with
-       Some p -> f (o_mDOMNode_of_mDOMNode (mDOMNode_of_boxed (Obj.magic p)))
+     let marshal_jump f _ =
+      function
+         [GtkArgv.POINTER node] -> f (o_mDOMNode_of_mDOMNode (mDOMNode_of_boxed_option node))
        | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_jump"
      in
       { name = "jump"; marshaller = marshal_jump }
 
     let selection_changed : ([>`math_view],_) t =
-     let marshal_selection_changed f argv =
-      match GtkArgv.get_pointer argv ~pos:0 with
-        Some p ->f (o_mDOMNode_option_of_mDOMNode_option (mDOMNode_option_of_boxed (Obj.magic p)))
-       | None -> f None
+     let marshal_selection_changed f _ =
+      function
+         [GtkArgv.POINTER node] -> f (o_mDOMNode_option_of_mDOMNode_option (mDOMNode_option_of_boxed_option node))
+       | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_selection_changed"
      in
       { name = "selection_changed"; marshaller = marshal_selection_changed }
   end