* restored binding with gtkmathview 0.4.0

[helm.git] / helm / DEVEL / lablgtkmathview / gMathView.ml

diff --git a/helm/DEVEL/lablgtkmathview/gMathView.ml b/helm/DEVEL/lablgtkmathview/gMathView.ml
index 40596204660ff993320180525ff3eb629ec3adae..646d68b0a1354558006ad9db4b24c37c06aac178 100644 (file)
--- a/helm/DEVEL/lablgtkmathview/gMathView.ml
+++ b/helm/DEVEL/lablgtkmathview/gMathView.ml
@@ -45,17 +45,23 @@ class math_view_signals obj = object
         S.marshaller = new_marshaller }
     in
      GtkSignal.connect ~sgn:new_clicked obj ~after
-  method selection_changed =
+  method press_move =
    let module S = GtkSignal in
-    let new_selection_changed =
+    let new_press_move =
      let new_marshaller f x y =
-      MathView.Signals.selection_changed.S.marshaller
-       (function None -> f None | Some e -> f (Some (new Gdome.element e))) x y
+      MathView.Signals.press_move.S.marshaller
+       (fun x y ->
+         let option_element_of_option v =
+         match v with
+            None -> None
+          | Some v' -> Some (new Gdome.element v')
+        in
+         f (option_element_of_option x) (option_element_of_option y)) x y
      in
-      { S.name = "selection_changed"; S.classe = `math_view;
+      { S.name = "press_move"; S.classe = `math_view;
         S.marshaller = new_marshaller }
     in
-     GtkSignal.connect ~sgn:new_selection_changed obj ~after
+     GtkSignal.connect ~sgn:new_press_move obj ~after
   method element_changed =
    let module S = GtkSignal in
     let new_element_changed =
@@ -69,26 +75,19 @@ class math_view_signals obj = object
      GtkSignal.connect ~sgn:new_element_changed obj ~after
 end
 
-class math_view obj = object
+class math_view_skel obj = object
  inherit GContainer.container (obj : Gtk_mathview.math_view obj)
- method connect = new math_view_signals obj
- method load ~filename =
-  if not (MathView.load obj ~filename) then raise (ErrorLoadingFile filename)
- method load_tree ~dom =
-  if not (MathView.load_tree obj ~dom:((dom : Gdome.document)#as_Document)) then
+ method freeze = MathView.freeze obj
+ method thaw = MathView.thaw obj
+ method load_uri ~filename =
+  if not (MathView.load_uri obj ~filename) then raise (ErrorLoadingFile filename)
+ method load_doc ~dom =
+  if not (MathView.load_doc obj ~dom:((dom : Gdome.document)#as_Document)) then
    raise ErrorLoadingDOM
  method unload = MathView.unload obj
- method get_selection =
-  match MathView.get_selection obj with
-     None -> None
-   | Some element -> Some (new Gdome.element element)
- method set_selection element =
-  let element =
-   match element with
-      None -> None
-    | Some element -> Some ((element : Gdome.element)#as_Element)
-  in
-   MathView.set_selection obj element
+ method select element = MathView.select obj ((element : Gdome.element)#as_Element)
+ method unselect element = MathView.unselect obj ((element : Gdome.element)#as_Element)
+ method is_selected element = MathView.is_selected obj ((element : Gdome.element)#as_Element)
  method get_width = MathView.get_width obj
  method get_height = MathView.get_height obj
  method get_top = MathView.get_top obj
@@ -105,8 +104,6 @@ class math_view obj = object
  method get_font_size = MathView.get_font_size obj
  method set_anti_aliasing = MathView.set_anti_aliasing obj
  method get_anti_aliasing = MathView.get_anti_aliasing obj
- method set_kerning = MathView.set_kerning obj
- method get_kerning = MathView.get_kerning obj
  method set_transparency = MathView.set_transparency obj
  method get_transparency = MathView.get_transparency obj
  method set_log_verbosity = MathView.set_log_verbosity obj
@@ -120,17 +117,11 @@ class math_view obj = object
   if not result then raise (ErrorWritingFile filename)
  method get_font_manager_type = MathView.get_font_manager_type obj
  method set_font_manager_type ~fm_type = MathView.set_font_manager_type obj ~fm_type
- method get_element =
-  match MathView.get_element obj with
-     None -> None
-   | Some element -> Some (new Gdome.element element)
- method action_get_selected = MathView.action_get_selected obj
- method action_set_selected = MathView.action_set_selected obj
- method get_action =
-  match MathView.get_action obj with
-     None -> None
-   | Some ac -> Some (new Gdome.element ac)
- method action_toggle = MathView.action_toggle obj
+end
+
+class math_view obj = object
+ inherit math_view_skel (obj : Gtk_mathview.math_view obj)
+ method connect = new math_view_signals obj
 end
 
 let math_view ?adjustmenth ?adjustmentv ?font_size ?font_manager ?border_width