X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2FgtkMathView.ml;h=5d400bc5968af9b44c5f1c1c6d47e5ec9b44d8d3;hb=89262281b6e83bd2321150f81f1a0583645eb0c8;hp=eed812d9e893f4c2b56fa1ba44162b7f99e2b72c;hpb=aa4eb8949201e7a7b54e3459ec0fe271e126049c;p=helm.git

diff --git a/helm/DEVEL/lablgtkmathview/gtkMathView.ml b/helm/DEVEL/lablgtkmathview/gtkMathView.ml
index eed812d9e..5d400bc59 100644
--- a/helm/DEVEL/lablgtkmathview/gtkMathView.ml
+++ b/helm/DEVEL/lablgtkmathview/gtkMathView.ml
@@ -26,25 +26,13 @@ open Tags
 open GtkBase
 open Gpointer
 
-external mDOMNode_of_boxed_option :
- Gpointer.boxed option -> Minidom.mDOMNode =
-  "ml_gtk_math_view_mDOMNode_of_boxed_option"
+external gdome_element_of_boxed_option :
+ Gpointer.boxed option -> TElement.t =
+  "ml_gtk_math_view_gdome_element_of_boxed_option"
 
-external mDOMNode_option_of_boxed_option :
- Gpointer.boxed option -> Minidom.mDOMNode option =
-  "ml_gtk_math_view_mDOMNode_option_of_boxed_option"
-
-let o_mDOMNode_of_mDOMNode node = new Ominidom.o_mDOMNode node
-
-let o_mDOMNode_option_of_mDOMNode_option =
-  function
-  | Some x -> Some (o_mDOMNode_of_mDOMNode x)
-  | None   -> None
-
-let mDOMNode_option_of_o_mDOMNode_option =
-  function
-  | Some x -> Some (x#get_dom_node)
-  | None   -> None
+external gdome_element_option_of_boxed_option :
+ Gpointer.boxed option -> TElement.t option =
+  "ml_gtk_math_view_gdome_element_option_of_boxed_option"
 
 module MathView = struct
   exception NoSelection
@@ -56,20 +44,15 @@ module MathView = struct
    create (optboxed adjustmenth) (optboxed adjustmentv)
   external load : [>`math_view] obj -> filename:string -> bool =
    "ml_gtk_math_view_load"
-  external raw_load_tree : [>`math_view] obj -> Minidom.mDOMDoc -> bool =
+  external load_tree : [>`math_view] obj -> dom:[> `Document] GdomeT.t -> bool =
    "ml_gtk_math_view_load_tree"
-  let load_tree obj ~(dom:Ominidom.o_mDOMDoc) =
-   raw_load_tree obj dom#get_dom_doc
   external unload : [>`math_view] obj -> unit =
    "ml_gtk_math_view_unload"
-  external raw_get_selection : [>`math_view] obj -> Minidom.mDOMNode option =
+  external get_selection : [>`math_view] obj -> TElement.t option =
    "ml_gtk_math_view_get_selection"
-  let get_selection obj =
-   o_mDOMNode_option_of_mDOMNode_option (raw_get_selection obj)
-  external raw_set_selection : [>`math_view] obj -> Minidom.mDOMNode option -> unit=
+  external set_selection :
+   [>`math_view] obj -> [> `Element] GdomeT.t option -> unit=
    "ml_gtk_math_view_set_selection"
-  let set_selection obj node =
-   raw_set_selection obj (mDOMNode_option_of_o_mDOMNode_option node)
   external get_width : [>`math_view] obj -> int =
    "ml_gtk_math_view_get_width"
   external get_height : [>`math_view] obj -> int =
@@ -117,18 +100,14 @@ module MathView = struct
   external set_font_manager_type : [>`math_view] obj ->
     fm_type:[`font_manager_gtk | `font_manager_t1] -> unit =
    "ml_gtk_math_view_set_font_manager_type"
-  external raw_get_element : [>`math_view] obj -> Minidom.mDOMNode option =
+  external get_element : [>`math_view] obj -> TElement.t option =
    "ml_gtk_math_view_get_element"
-  let get_element obj =
-   o_mDOMNode_option_of_mDOMNode_option (raw_get_element obj)
   external action_get_selected : [>`math_view] obj -> int =
    "ml_gtk_math_view_action_get_selected"
   external action_set_selected : [>`math_view] obj -> int -> unit =
    "ml_gtk_math_view_action_set_selected"
-  external raw_get_action : [>`math_view] obj -> Minidom.mDOMNode option =
+  external get_action : [>`math_view] obj -> TElement.t option =
    "ml_gtk_math_view_get_action"
-  let get_action obj =
-   o_mDOMNode_option_of_mDOMNode_option (raw_get_action obj)
   external action_toggle : [>`math_view] obj -> unit =
    "ml_gtk_math_view_action_toggle"
   
@@ -138,25 +117,27 @@ module MathView = struct
     let clicked : ([>`math_view],_) t =
      let marshal_clicked f _ =
       function
-         [GtkArgv.POINTER node] -> f (o_mDOMNode_of_mDOMNode (mDOMNode_of_boxed_option node))
+         [GtkArgv.POINTER element] -> f (gdome_element_of_boxed_option element)
        | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_clicked"
      in
-      { name = "clicked"; marshaller = marshal_clicked }
+      { name = "clicked"; classe = `math_view; marshaller = marshal_clicked }
 
     let selection_changed : ([>`math_view],_) t =
      let marshal_selection_changed f _ =
       function
-         [GtkArgv.POINTER node] -> f (o_mDOMNode_option_of_mDOMNode_option (mDOMNode_option_of_boxed_option node))
+         [GtkArgv.POINTER element] -> f (gdome_element_option_of_boxed_option element)
        | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_selection_changed"
      in
-      { name = "selection_changed"; marshaller = marshal_selection_changed }
+      { name = "selection_changed"; classe = `math_view;
+        marshaller = marshal_selection_changed }
 
     let element_changed : ([>`math_view],_) t =
      let marshal_element_changed f _ =
       function
-         [GtkArgv.POINTER node] -> f (o_mDOMNode_option_of_mDOMNode_option (mDOMNode_option_of_boxed_option node))
+         [GtkArgv.POINTER element] -> f (gdome_element_option_of_boxed_option element)
        | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_element_changed"
      in
-      { name = "element_changed"; marshaller = marshal_element_changed }
+      { name = "element_changed"; classe = `math_view;
+        marshaller = marshal_element_changed }
   end
 end