(pre-)porting to gtkmathview 0.6.3 && ocaml 3.08

[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 1c077846b3c377f133934bcc65e929b93c2383d2..3561c551c3be3a4512f926efc83840d95eff8ed2 100644 (file)
--- a/helm/DEVEL/lablgtkmathview/test/test.ml
+++ b/helm/DEVEL/lablgtkmathview/test/test.ml
@@ -227,13 +227,9 @@ let unload mathview () =
  flush stdout
 ;;
 
-let get_width mathview () =
- print_string ("width: " ^ string_of_int (mathview#get_width) ^ "\n") ;
- flush stdout
-;;
-
-let get_height mathview () =
- print_string ("height: " ^ string_of_int (mathview#get_height) ^ "\n") ;
+let get_size mathview () =
+ let width, height = mathview#get_size in
+ print_string ("width: " ^ string_of_int width ^ ", height: " ^ string_of_int height ^ "\n") ;
  flush stdout
 ;;
 
@@ -259,20 +255,14 @@ let set_adjustments mathview () =
   flush stdout
 ;;
 
-let get_hadjustment mathview () =
- let adj = mathview#get_hadjustment in
-  adj#set_value ((adj#lower +. adj#upper) /. 2.0) ;
+let get_adjustments mathview () =
+ let hadj, vadj = mathview#get_adjustments in
+  hadj#set_value ((hadj#lower +. hadj#upper) /. 2.0) ;
+  vadj#set_value ((vadj#lower +. vadj#upper) /. 2.0) ;
   print_string "hadjustment: SEEM TO WORK\n" ;
   flush stdout
 ;;
 
-let get_vadjustment mathview () =
- let adj = mathview#get_vadjustment in
-  adj#set_value ((adj#lower +. adj#upper) /. 2.0) ;
-  print_string "vadjustment: SEEM TO WORK\n" ;
-  flush stdout
-;;
-
 let get_buffer mathview () =
  let buffer = mathview#get_buffer in
   Gdk.Draw.rectangle buffer (Gdk.GC.create buffer) ~x:0 ~y:0
@@ -320,14 +310,6 @@ let get_element_at mathview () =
 ;;
 *)
 
-let get_drawing_area mathview () =
- begin
-  let da = mathview#get_drawing_area in
-  print_string ("don't know what to do with the drawing area\n")
- end ;
- flush stdout
-;;
-
 let _ = (GtkMain.Main.init ())
 ;;
 
@@ -343,13 +325,11 @@ let button_selection = GButton.button ~label:"get_selection" ~packing:(table#att
 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
 let button_reset_selections = GButton.button ~label:"reset_selections" ~packing:(table#attach ~left:4 ~top:3) () in
-let button_get_width = GButton.button ~label:"get_width" ~packing:(table#attach ~left:0 ~top:1) () in
-let button_get_height = GButton.button ~label:"get_height" ~packing:(table#attach ~left:1 ~top:1) () in
+let button_get_size = GButton.button ~label:"get_size" ~packing:(table#attach ~left:0 ~top:1) () in
 let button_get_top = GButton.button ~label:"get_top" ~packing:(table#attach ~left:2 ~top:1) () in
 let button_set_top = GButton.button ~label:"set_top" ~packing:(table#attach ~left:3 ~top:1) () in
 let button_set_adjustments = GButton.button ~label:"set_adjustments" ~packing:(table#attach ~left:4 ~top:1) () in
-let button_get_hadjustment = GButton.button ~label:"get_hadjustment" ~packing:(table#attach ~left:0 ~top:2) () in
-let button_get_vadjustment = GButton.button ~label:"get_vadjustment" ~packing:(table#attach ~left:1 ~top:2) () in
+let button_get_adjustments = GButton.button ~label:"get_adjustments" ~packing:(table#attach ~left:0 ~top:2) () in
 let button_get_buffer = GButton.button ~label:"get_buffer" ~packing:(table#attach ~left:2 ~top:2) () in
 let button_set_font_size = GButton.button ~label:"set_font_size" ~packing:(table#attach ~left:4 ~top:2) () in
 let button_get_font_size = GButton.button ~label:"get_font_size" ~packing:(table#attach ~left:0 ~top:3) () in
@@ -357,7 +337,6 @@ let button_set_log_verbosity = GButton.button ~label:"set_log_verbosity" ~packin
 let button_get_log_verbosity = GButton.button ~label:"get_log_verbosity" ~packing:(table#attach ~left:1 ~top:4) () in
 let button_load_dom = GButton.button ~label:"load from DOM" ~packing:(table#attach ~left:2 ~top:5) () in
 (* let button_get_element_at = GButton.button ~label:"get_element_at" ~packing:(table#attach ~left:3 ~top:5) () in *)
-let button_get_drawing_area = GButton.button ~label:"get_drawing_area" ~packing:(table#attach ~left:4 ~top:5) () in
 (* Signals connection *)
 ignore(button_load#connect#clicked (load_uri mathview)) ;
 ignore(button_unload#connect#clicked (unload mathview)) ;
@@ -365,13 +344,11 @@ 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)) ;
 ignore(button_reset_selections#connect#clicked (test_reset_selections mathview)) ;
-ignore(button_get_width#connect#clicked (get_width mathview)) ;
-ignore(button_get_height#connect#clicked (get_height mathview)) ;
+ignore(button_get_size#connect#clicked (get_size mathview)) ;
 ignore(button_get_top#connect#clicked (get_top mathview)) ;
 ignore(button_set_top#connect#clicked (set_top mathview)) ;
 ignore(button_set_adjustments#connect#clicked (set_adjustments mathview)) ;
-ignore(button_get_hadjustment#connect#clicked (get_hadjustment mathview)) ;
-ignore(button_get_vadjustment#connect#clicked (get_vadjustment mathview)) ;
+ignore(button_get_adjustments#connect#clicked (get_adjustments mathview)) ;
 ignore(button_get_buffer#connect#clicked (get_buffer mathview)) ;
 ignore(button_set_font_size#connect#clicked (set_font_size mathview)) ;
 ignore(button_get_font_size#connect#clicked (get_font_size mathview)) ;
@@ -382,7 +359,6 @@ ignore(mathview#connect#selection_changed (selection_changed mathview));
 ignore(mathview#connect#element_over (element_over mathview)) ;
 ignore(button_load_dom#connect#clicked (load_doc mathview)) ;
 (* ignore(button_get_element_at#connect#clicked (get_element_at mathview)) ; *)
-ignore(button_get_drawing_area#connect#clicked (get_drawing_area mathview)) ;
 (* Main Loop *)
 main_window#show () ;
 GMain.Main.main ()