X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2FgMathView.ml;h=ce7edcf10bca151dec471650b44f4c9b318f9a96;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=3687c043b22d4d54cbbc72da1f327970f6f01be8;hpb=1957a1f151c547f04625c4379e51ab66bddb69c7;p=helm.git

diff --git a/helm/DEVEL/lablgtkmathview/gMathView.ml b/helm/DEVEL/lablgtkmathview/gMathView.ml
index 3687c043b..ce7edcf10 100644
--- a/helm/DEVEL/lablgtkmathview/gMathView.ml
+++ b/helm/DEVEL/lablgtkmathview/gMathView.ml
@@ -22,92 +22,23 @@
  *)
 
 open Gaux
-open Gtk
 open Gtk_mathview
+open Gobject
+open Gtk
 open GtkBase
 open GtkMathView
+open OgtkMathViewProps
 open GObj
 
 exception ErrorLoadingFile of string;;
 exception ErrorWritingFile of string;;
 exception ErrorLoadingDOM;;
-exception NoSelection;;
 
 let option_element_of_option =
  function
     None -> None
   | Some v -> Some (new Gdome.element v)
 
-class math_view_signals obj = object
-  inherit GContainer.container_signals obj
-  method click =
-   let module S = GtkSignal in
-    let new_click =
-     let new_marshaller f x y =
-      MathView.Signals.click.S.marshaller
-       (fun e s -> f (option_element_of_option e) s) x y
-     in
-      { S.name = "click"; S.classe = `math_view;
-        S.marshaller = new_marshaller }
-    in
-     GtkSignal.connect ~sgn:new_click obj ~after
-  method select_begin =
-   let module S = GtkSignal in
-    let new_select_begin =
-     let new_marshaller f x y =
-      MathView.Signals.select_begin.S.marshaller
-       (fun e s -> f (option_element_of_option e) s) x y
-     in
-      { S.name = "select_begin"; S.classe = `math_view;
-        S.marshaller = new_marshaller }
-    in
-     GtkSignal.connect ~sgn:new_select_begin obj ~after
-   method select_over =
-   let module S = GtkSignal in
-    let new_select_over =
-     let new_marshaller f x y =
-      MathView.Signals.select_over.S.marshaller
-       (fun e s -> f (option_element_of_option e) s) x y
-     in
-      { S.name = "select_over"; S.classe = `math_view;
-        S.marshaller = new_marshaller }
-    in
-     GtkSignal.connect ~sgn:new_select_over obj ~after
-   method select_end =
-   let module S = GtkSignal in
-    let new_select_end =
-     let new_marshaller f x y =
-      MathView.Signals.select_end.S.marshaller
-       (fun e s -> f (option_element_of_option e) s) x y
-     in
-      { S.name = "select_end"; S.classe = `math_view;
-        S.marshaller = new_marshaller }
-    in
-     GtkSignal.connect ~sgn:new_select_end obj ~after
-   method select_abort =
-   let module S = GtkSignal in
-    let new_select_abort =
-     let new_marshaller f x y =
-      MathView.Signals.select_abort.S.marshaller
-       (fun () -> f ()) x y
-     in
-      { S.name = "select_abort"; S.classe = `math_view;
-        S.marshaller = new_marshaller }
-    in
-     GtkSignal.connect ~sgn:new_select_abort obj ~after
-  method element_over =
-   let module S = GtkSignal in
-    let new_element_over =
-     let new_marshaller f x y =
-      MathView.Signals.element_over.S.marshaller
-       (fun e s -> f (option_element_of_option e) s) x y
-     in
-      { S.name = "element_over"; S.classe = `math_view;
-        S.marshaller = new_marshaller }
-    in
-     GtkSignal.connect ~sgn:new_element_over obj ~after
-end
-
 class math_view_skel obj = object
  inherit GContainer.container (obj : Gtk_mathview.math_view obj)
  method freeze = MathView.freeze obj
@@ -125,59 +56,30 @@ class math_view_skel obj = object
  method get_width = MathView.get_width obj
  method get_height = MathView.get_height obj
  method get_top = MathView.get_top obj
- method set_top = MathView.set_top obj
- method set_adjustments =
-  fun adj1 adj2 ->
-   MathView.set_adjustments obj (GData.as_adjustment adj1)
-   (GData.as_adjustment adj2)
+ method set_top x y  = MathView.set_top obj x y
+ method set_adjustments adj1 adj2 = MathView.set_adjustments obj (GData.as_adjustment adj1) (GData.as_adjustment adj2)
  method get_hadjustment = new GData.adjustment (MathView.get_hadjustment obj)
  method get_vadjustment = new GData.adjustment (MathView.get_vadjustment obj)
  method get_buffer = MathView.get_buffer obj
- method get_frame = new GBin.frame (MathView.get_frame obj)
  method get_drawing_area = new GMisc.drawing_area (MathView.get_drawing_area obj)
  method set_font_size = MathView.set_font_size obj
  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_transparency = MathView.set_transparency obj
- method get_transparency = MathView.get_transparency obj
  method set_log_verbosity = MathView.set_log_verbosity obj
  method get_log_verbosity = MathView.get_log_verbosity obj
- method export_to_postscript
- 	?(width = 595) ?(height = 822) ?(x_margin = 72) ?(y_margin = 72)
-	?(disable_colors = false) ~filename () =
-  let result = MathView.export_to_postscript obj
-	~width ~height ~x_margin ~y_margin ~disable_colors ~filename
-  in
-  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
+end
+
+class math_view_signals obj = object
+  inherit GContainer.container_signals_impl obj
+  inherit math_view_sigs
 end
 
 class math_view obj = object
- inherit math_view_skel (obj : Gtk_mathview.math_view obj)
- method connect = new math_view_signals obj
+  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
- ?width ?height ?packing ?show () =
- let w =
-   MathView.create
-    ?adjustmenth:(may_map ~f:GData.as_adjustment adjustmenth)
-    ?adjustmentv:(may_map ~f:GData.as_adjustment adjustmentv)
-    ()
- in
-  Container.set w ?border_width ?width ?height;
- let mathview = pack_return (new math_view w) ~packing ~show in
- begin
-    match font_size with
-    | Some size -> mathview#set_font_size size
-    | None      -> ()
-  end;
-  begin
-    match font_manager with
-    | Some manager -> mathview#set_font_manager_type ~fm_type:manager
-    | None         -> ()
-  end;
-  mathview
+let math_view ?hadjustment ?vadjustment ?font_size ?log_verbosity =
+  GtkBase.Container.make_params ~cont:(
+  OgtkMathViewProps.pack_return
+    (fun p -> OgtkMathViewProps.set_params (new math_view (MathView.create p)) ~font_size ~log_verbosity)) []
 ;;