X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2FgMathView.ml;h=57a6aa9a6a64dcc8b96b437f00b0dc9f57d84d48;hb=b24260fd5c00791ad04042405e3942f288f54ab2;hp=646d68b0a1354558006ad9db4b24c37c06aac178;hpb=e7bcb20821caa3e03bf1b77a7e9f329aeaacab07;p=helm.git diff --git a/helm/DEVEL/lablgtkmathview/gMathView.ml b/helm/DEVEL/lablgtkmathview/gMathView.ml index 646d68b0a..57a6aa9a6 100644 --- a/helm/DEVEL/lablgtkmathview/gMathView.ml +++ b/helm/DEVEL/lablgtkmathview/gMathView.ml @@ -1,4 +1,5 @@ -(* Copyright (C) 2000, Luca Padovani . +(* Copyright (C) 2000-2003, Luca Padovani , + * Claudio Sacerdoti Coen . * * This file is part of lablgtkmathview, the Ocaml binding * for the GtkMathView widget. @@ -21,128 +22,66 @@ *) 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;; -class math_view_signals obj = object - inherit GContainer.container_signals obj - method clicked = - let module S = GtkSignal in - let new_clicked = - let new_marshaller f x y = - MathView.Signals.clicked.S.marshaller - (fun e -> f (new Gdome.element e)) x y - in - { S.name = "clicked"; S.classe = `math_view; - S.marshaller = new_marshaller } - in - GtkSignal.connect ~sgn:new_clicked obj ~after - method press_move = - let module S = GtkSignal in - let new_press_move = - let new_marshaller f 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 = "press_move"; S.classe = `math_view; - S.marshaller = new_marshaller } - in - GtkSignal.connect ~sgn:new_press_move obj ~after - method element_changed = - let module S = GtkSignal in - let new_element_changed = - let new_marshaller f x y = - MathView.Signals.element_changed.S.marshaller - (function None -> f None | Some e -> f (Some (new Gdome.element e))) x y - in - { S.name = "element_changed"; S.classe = `math_view; - S.marshaller = new_marshaller } - in - GtkSignal.connect ~sgn:new_element_changed obj ~after -end +let option_element_of_option = + function + None -> None + | Some v -> Some (new Gdome.element v) class math_view_skel obj = object - inherit GContainer.container (obj : Gtk_mathview.math_view obj) + inherit GObj.widget (obj : Gtk_mathview.math_view obj) 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 + method load_root ~root = + if not (MathView.load_root obj ~root:((root : Gdome.element)#as_Element)) then raise ErrorLoadingDOM method unload = MathView.unload obj 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_element_at x y = option_element_of_option (MathView.get_element_at obj x y) + method structure_changed element = MathView.structure_changed obj ((element : Gdome.element)#as_Element) + method attribute_changed element ~name = MathView.attribute_changed obj ((element : Gdome.element)#as_Element) ((name : Gdome.domString)#as_DOMString) + method get_bounding_box = MathView.get_bounding_box obj + method get_size = MathView.get_size 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 get_hadjustment = new GData.adjustment (MathView.get_hadjustment obj) - method get_vadjustment = new GData.adjustment (MathView.get_vadjustment obj) + 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_adjustments = + let hadj, vadj = MathView.get_adjustments obj in + new GData.adjustment hadj, new GData.adjustment vadj method get_buffer = MathView.get_buffer obj - method get_frame = new GBin.frame (MathView.get_frame 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 GObj.widget_signals_impl obj + inherit math_view__g_meta_dom_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.Widget.size_params ~cont:( + OgtkMathViewProps.pack_return + (fun p -> OgtkMathViewProps.set_params (new math_view (MathView.create p)) ~font_size ~log_verbosity)) [] ;;