X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Flablgtkmathview%2FgMathView.ml;h=ce7edcf10bca151dec471650b44f4c9b318f9a96;hb=5325734bc2e4927ed7ec146e35a6f0f2b49f50c1;hp=40596204660ff993320180525ff3eb629ec3adae;hpb=91da8438a05450c656ae949e6a3ae8e4bbc3d161;p=helm.git diff --git a/helm/DEVEL/lablgtkmathview/gMathView.ml b/helm/DEVEL/lablgtkmathview/gMathView.ml index 405962046..ce7edcf10 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,137 +22,64 @@ *) 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 selection_changed = - let module S = GtkSignal in - let new_selection_changed = - let new_marshaller f x y = - MathView.Signals.selection_changed.S.marshaller - (function None -> f None | Some e -> f (Some (new Gdome.element e))) x y - in - { S.name = "selection_changed"; S.classe = `math_view; - S.marshaller = new_marshaller } - in - GtkSignal.connect ~sgn:new_selection_changed 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 obj = object +class math_view_skel obj = object inherit GContainer.container (obj : Gtk_mathview.math_view obj) - method connect = new math_view_signals obj - method load ~filename = - if not (MathView.load obj ~filename) then raise (ErrorLoadingFile filename) - method load_tree ~dom = - if not (MathView.load_tree obj ~dom:((dom : Gdome.document)#as_Document)) then + 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 raise ErrorLoadingDOM method unload = MathView.unload obj - method get_selection = - match MathView.get_selection obj with - None -> None - | Some element -> Some (new Gdome.element element) - method set_selection element = - let element = - match element with - None -> None - | Some element -> Some ((element : Gdome.element)#as_Element) - in - MathView.set_selection obj element + 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_element_at x y = option_element_of_option (MathView.get_element_at obj x y) 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_kerning = MathView.set_kerning obj - method get_kerning = MathView.get_kerning 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 - method get_element = - match MathView.get_element obj with - None -> None - | Some element -> Some (new Gdome.element element) - method action_get_selected = MathView.action_get_selected obj - method action_set_selected = MathView.action_set_selected obj - method get_action = - match MathView.get_action obj with - None -> None - | Some ac -> Some (new Gdome.element ac) - method action_toggle = MathView.action_toggle 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 +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 +end + +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)) [] ;;