ocaml 3.09 transition

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

diff --git a/helm/DEVEL/lablgtkmathview/test/test.ml b/helm/DEVEL/lablgtkmathview/test/test.ml
index 14e14bf7a9875691028a39e9ab87b177b4c6fc62..b0e584cae1adee29de0dbfa6521ba5e7ab945de2 100644 (file)
--- a/helm/DEVEL/lablgtkmathview/test/test.ml
+++ b/helm/DEVEL/lablgtkmathview/test/test.ml
@@ -160,13 +160,22 @@ let click mathview ((element : Gdome.element option), _, _, _) =
        ()
 ;;
 
-
 let load_uri mathview () =
  mathview#load_uri ~filename:"test.xml" ;
  print_string "load: SEEMS TO WORK\n" ;
  flush stdout
 ;;
 
+let get_document mathview () =
+ (match mathview#get_document with
+ | None -> print_string "no document loaded\n"
+ | Some doc ->
+     let name = "out.xml" in
+     ignore ((Gdome.domImplementation ())#saveDocumentToFile ~doc ~name ());
+     print_string ("document loaded and saved to " ^ name ^ "\n"));
+ flush stdout
+;;
+
 let load_doc mathview () =
  mathview#load_root ~root:(((Gdome.domImplementation ())#createDocumentFromURI ~uri:"test.xml" ())#get_documentElement) ;
  print_string "load from DOM: SEEMS TO WORK\n" ;
@@ -223,17 +232,22 @@ let test_reset_selections (mathview : GMathViewAux.multi_selection_math_view) ()
 
 let select_over (mathview : GMathViewAux.multi_selection_math_view) =
   (fun (_,_,_,state) ->
-    let c = 
-      function
-        `SHIFT -> "shift "
-       | `LOCK -> "lock "
-       | `CONTROL -> "control "
-       | `MOD1 -> "mod1 "
-       | _ -> "nomod "
+    let c = function
+      | `SHIFT    -> "shift"
+      | `LOCK     -> "lock"
+      | `CONTROL  -> "control"
+      | `MOD1     -> "mod1"
+      | _         -> ""
     in
-    List.iter (fun x -> print_string (c x)) (Gdk.Convert.modifier state) ;
-    print_char '\n' ;
-    flush stdout)
+    let msg =
+      String.concat ","
+        (List.filter (fun s -> s <> "")
+          (List.map c (Gdk.Convert.modifier state)))
+    in
+    if msg <> "" then begin
+      print_endline ("modifiers: " ^ msg);
+      flush stdout
+    end)
 
 let unload mathview () =
  mathview#unload ;
@@ -335,6 +349,7 @@ let mathview= GMathViewAux.multi_selection_math_view ~packing:sw#add ~width:50 ~
 let table = GPack.table ~rows:6 ~columns:5 ~packing:vbox#pack () in
 let button_load = GButton.button ~label:"load" ~packing:(table#attach ~left:1 ~top:0) () in
 let button_unload = GButton.button ~label:"unload" ~packing:(table#attach ~left:2 ~top:0) () in
+let button_get_document = GButton.button ~label:"get_document" ~packing:(table#attach ~left:1 ~top:1) () in
 let button_selection = GButton.button ~label:"get_selection" ~packing:(table#attach ~left:3 ~top:0) () in
 let button_set_selection = GButton.button ~label:"set_selection" ~packing:(table#attach ~left:4 ~top:0) () in
 let button_add_selection = GButton.button ~label:"add_selection" ~packing:(table#attach ~left:3 ~top:3) () in
@@ -354,6 +369,7 @@ let button_load_dom = GButton.button ~label:"load from DOM" ~packing:(table#atta
 (* Signals connection *)
 ignore(button_load#connect#clicked (load_uri mathview)) ;
 ignore(button_unload#connect#clicked (unload mathview)) ;
+ignore(button_get_document#connect#clicked (get_document mathview)) ;
 ignore(button_selection#connect#clicked (test_get_selection mathview)) ;
 ignore(button_set_selection#connect#clicked (test_set_selection mathview)) ;
 ignore(button_add_selection#connect#clicked (test_add_selection mathview)) ;
@@ -371,9 +387,9 @@ ignore(button_get_log_verbosity#connect#clicked (get_log_verbosity mathview)) ;
 ignore(mathview#connect#click (click mathview)) ;
 ignore(mathview#connect#selection_changed (selection_changed mathview));
 ignore(mathview#connect#element_over (element_over mathview)) ;
-ignore(self#connect#select_over (select_over mathview));
-
+ignore(mathview#connect#select_over (select_over mathview));
 ignore(button_load_dom#connect#clicked (load_doc mathview)) ;
+ignore(main_window#connect#destroy (fun _ -> GMain.quit ()));
 (* ignore(button_get_element_at#connect#clicked (get_element_at mathview)) ; *)
 (* Main Loop *)
 main_window#show () ;