X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2FgtkMathView.ml;h=e337bdf10505d4c0d461d283745538b72d0776af;hb=30321de51742b359e6186b0388c183b2adb5e36a;hp=394d97e1484ca9870852f0bfecc9cb170a625f78;hpb=1c22e6a7aa5a776bc4fb2982826aa53d171a2d5f;p=helm.git

diff --git a/helm/DEVEL/lablgtkmathview/gtkMathView.ml b/helm/DEVEL/lablgtkmathview/gtkMathView.ml
index 394d97e14..e337bdf10 100644
--- a/helm/DEVEL/lablgtkmathview/gtkMathView.ml
+++ b/helm/DEVEL/lablgtkmathview/gtkMathView.ml
@@ -21,155 +21,75 @@
  * For details, send a mail to the author.
  *)
 
-open Gtk
 open Gtk_mathview
+open Gaux
+open Gobject
+open Gtk
 open Tags
+open GtkMathViewProps
 open GtkBase
-open Gpointer
-
-external gdome_element_of_boxed_option :
- Gpointer.boxed option -> TElement.t =
-  "ml_gtk_math_view_gdome_element_of_boxed_option"
 
-external gdome_element_option_of_boxed_option :
- Gpointer.boxed option -> TElement.t option =
-  "ml_gtk_math_view_gdome_element_option_of_boxed_option"
+external _gtkmathview_init : unit -> unit = "ml_gtk_mathview_init"
+let () = _gtkmathview_init ()
 
 module MathView = struct
-  exception NoSelection
-
-  let cast w : math_view obj = Object.try_cast w "GtkMathView"
-  external create : Gtk.adjustment optobj -> Gtk.adjustment optobj -> 
-   math_view obj = "ml_gtk_math_view_new"
-  let create ~adjustmenth ~adjustmentv () =
-   create (optboxed adjustmenth) (optboxed adjustmentv)
-  external freeze : [>`math_view] obj -> unit =
+  include MathView
+  external freeze : [>`mathview] obj -> unit =
    "ml_gtk_math_view_freeze"
-  external thaw : [>`math_view] obj -> unit =
+  external thaw : [>`mathview] obj -> unit =
    "ml_gtk_math_view_thaw"
-  external load_uri : [>`math_view] obj -> filename:string -> bool =
+  external load_uri : [>`mathview] obj -> filename:string -> bool =
    "ml_gtk_math_view_load_uri"
-  external load_doc : [>`math_view] obj -> dom:[> `Document] GdomeT.t -> bool =
-   "ml_gtk_math_view_load_doc"
-  external unload : [>`math_view] obj -> unit =
+  external load_root : [>`mathview] obj -> root:[> `Element] GdomeT.t -> bool =
+   "ml_gtk_math_view_load_root"
+  external unload : [>`mathview] obj -> unit =
    "ml_gtk_math_view_unload"
   external select :
-   [>`math_view] obj -> [> `Element] GdomeT.t -> unit =
+   [>`mathview] obj -> [> `Element] GdomeT.t -> unit =
    "ml_gtk_math_view_select"
   external unselect :
-   [>`math_view] obj -> [> `Element] GdomeT.t -> unit =
+   [>`mathview] obj -> [> `Element] GdomeT.t -> unit =
    "ml_gtk_math_view_unselect"
   external is_selected :
-   [>`math_view] obj -> [> `Element] GdomeT.t -> bool =
+   [>`mathview] obj -> [> `Element] GdomeT.t -> bool =
    "ml_gtk_math_view_is_selected"
+  external structure_changed :
+   [>`mathview] obj -> [> `Element] GdomeT.t -> unit =
+   "ml_gtk_math_view_structure_changed"
+  external attribute_changed :
+   [>`mathview] obj -> [> `Element] GdomeT.t -> name:TDOMString.t -> unit =
+   "ml_gtk_math_view_attribute_changed"
+  external get_bounding_box :
+   [>`mathview] obj -> (int * int * int) =
+   "ml_gtk_math_view_get_bounding_box"
   external get_element_at :
-   [> `math_view] obj -> int -> int -> TElement.t option =
+   [> `mathview] obj -> int -> int -> TElement.t option =
    "ml_gtk_math_view_get_element_at"
-  external get_width : [>`math_view] obj -> int =
+   (* beginning of prop-like methods *)
+  external get_width : [>`mathview] obj -> int =
    "ml_gtk_math_view_get_width"
-  external get_height : [>`math_view] obj -> int =
+  external get_height : [>`mathview] obj -> int =
    "ml_gtk_math_view_get_height"
-  external get_top : [>`math_view] obj -> (int * int) =
+  external get_top : [>`mathview] obj -> (int * int) =
    "ml_gtk_math_view_get_top"
-  external set_top : [>`math_view] obj -> int -> int -> unit =
+  external set_top : [>`mathview] obj -> int -> int -> unit =
    "ml_gtk_math_view_set_top"
-  external set_adjustments : [>`math_view] obj -> Gtk.adjustment obj -> Gtk.adjustment obj -> unit =
+  external set_adjustments : [>`mathview] obj -> Gtk.adjustment obj -> Gtk.adjustment obj -> unit =
    "ml_gtk_math_view_set_adjustments"
-  external get_hadjustment : [>`math_view] obj -> Gtk.adjustment obj =
+  external get_hadjustment : [>`mathview] obj -> Gtk.adjustment obj =
    "ml_gtk_math_view_get_hadjustment"
-  external get_vadjustment : [>`math_view] obj -> Gtk.adjustment obj =
+  external get_vadjustment : [>`mathview] obj -> Gtk.adjustment obj =
    "ml_gtk_math_view_get_vadjustment"
-  external get_buffer : [>`math_view] obj -> Gdk.pixmap =
+  external get_buffer : [>`mathview] obj -> Gdk.pixmap =
    "ml_gtk_math_view_get_buffer"
-  external get_frame : [>`math_view] obj -> Gtk.frame obj =
-   "ml_gtk_math_view_get_frame"
-  external get_drawing_area : [>`math_view] obj -> Gtk.drawing_area obj =
+  external get_drawing_area : [>`mathview] obj -> Gtk.drawing_area obj =
    "ml_gtk_math_view_get_drawing_area"
-  external set_font_size : [>`math_view] obj -> int -> unit =
+  external set_font_size : [>`mathview] obj -> int -> unit =
    "ml_gtk_math_view_set_font_size"
-  external get_font_size : [>`math_view] obj -> int =
+  external get_font_size : [>`mathview] obj -> int =
    "ml_gtk_math_view_get_font_size"
-  external set_anti_aliasing : [>`math_view] obj -> bool -> unit =
-   "ml_gtk_math_view_set_anti_aliasing"
-  external get_anti_aliasing : [>`math_view] obj -> bool =
-   "ml_gtk_math_view_get_anti_aliasing"
-  external set_transparency : [>`math_view] obj -> bool -> unit =
-   "ml_gtk_math_view_set_transparency"
-  external get_transparency : [>`math_view] obj -> bool =
-   "ml_gtk_math_view_get_transparency"
-  external set_log_verbosity : [>`math_view] obj -> int -> unit =
+  external set_log_verbosity : [>`mathview] obj -> int -> unit =
    "ml_gtk_math_view_set_log_verbosity"
-  external get_log_verbosity : [>`math_view] obj -> int =
+  external get_log_verbosity : [>`mathview] obj -> int =
    "ml_gtk_math_view_get_log_verbosity"
-  external export_to_postscript :
-   [>`math_view] obj -> width:int -> height:int -> x_margin:int -> y_margin:int -> disable_colors:bool -> filename:string -> bool =
-   "ml_gtk_math_view_export_to_postscript_bytecode" "ml_gtk_math_view_export_to_postscript_native"
-  external get_font_manager_type : [>`math_view] obj ->
-   [`font_manager_gtk | `font_manager_t1] =
-   "ml_gtk_math_view_get_font_manager_type"
-  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"
-  
-  module Signals = struct
-    open GtkSignal
-
-    let click : ([>`math_view],_) t =
-     let marshal_click f _ =
-      function
-         [GtkArgv.POINTER element; GtkArgv.INT state] ->
-	   f (gdome_element_of_boxed_option element) state
-       | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_click"
-     in
-      { name = "click"; classe = `math_view; marshaller = marshal_click }
-
-    let element_over : ([>`math_view],_) t =
-     let marshal_element_over f _ =
-      function
-         [GtkArgv.POINTER element; GtkArgv.INT state] ->
-	   f (gdome_element_option_of_boxed_option element) state
-       | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_element_over"
-     in
-      { name = "element_over"; classe = `math_view;
-        marshaller = marshal_element_over }
-
-    let select_begin : ([>`math_view],_) t =
-     let marshal_select_begin f _ =
-      function
-         [GtkArgv.POINTER element; GtkArgv.INT state] ->
-	   f (gdome_element_option_of_boxed_option element) state
-       | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_select_begin"
-     in
-      { name = "select_begin"; classe = `math_view;
-        marshaller = marshal_select_begin }
-
-    let select_over : ([>`math_view],_) t =
-     let marshal_select_over f _ =
-      function
-         [GtkArgv.POINTER element; GtkArgv.INT state] ->
-	   f (gdome_element_option_of_boxed_option element) state
-       | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_select_over"
-     in
-      { name = "select_over"; classe = `math_view;
-        marshaller = marshal_select_over }
-
-    let select_end : ([>`math_view],_) t =
-     let marshal_select_end f _ =
-      function
-         [GtkArgv.POINTER element; GtkArgv.INT state] ->
-	   f (gdome_element_option_of_boxed_option element) state
-       | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_select_end"
-     in
-      { name = "select_end"; classe = `math_view;
-        marshaller = marshal_select_end }
-
-    let select_abort : ([>`math_view],_) t =
-     let marshal_select_abort f _ =
-      function
-         [] -> f ()
-       | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_select_abort"
-     in
-      { name = "select_abort"; classe = `math_view;
-        marshaller = marshal_select_abort }
-  end
 end