From: Stefano Zacchiroli Date: Wed, 28 Aug 2002 13:37:38 +0000 (+0000) Subject: forward compatibility changes for ocaml 3.06 X-Git-Tag: V_0_3_0_debian_8~2 X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=commitdiff_plain;h=91da8438a05450c656ae949e6a3ae8e4bbc3d161;p=helm.git forward compatibility changes for ocaml 3.06 --- diff --git a/helm/DEVEL/lablgtkmathview/gMathView.ml b/helm/DEVEL/lablgtkmathview/gMathView.ml index 63a3c234a..405962046 100644 --- a/helm/DEVEL/lablgtkmathview/gMathView.ml +++ b/helm/DEVEL/lablgtkmathview/gMathView.ml @@ -41,7 +41,8 @@ class math_view_signals obj = object MathView.Signals.clicked.S.marshaller (fun e -> f (new Gdome.element e)) x y in - { S.name = "clicked"; S.marshaller = new_marshaller } + { S.name = "clicked"; S.classe = `math_view; + S.marshaller = new_marshaller } in GtkSignal.connect ~sgn:new_clicked obj ~after method selection_changed = @@ -51,7 +52,8 @@ class math_view_signals obj = object 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.marshaller = new_marshaller } + { S.name = "selection_changed"; S.classe = `math_view; + S.marshaller = new_marshaller } in GtkSignal.connect ~sgn:new_selection_changed obj ~after method element_changed = @@ -61,7 +63,8 @@ class math_view_signals obj = object 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.marshaller = new_marshaller } + { S.name = "element_changed"; S.classe = `math_view; + S.marshaller = new_marshaller } in GtkSignal.connect ~sgn:new_element_changed obj ~after end diff --git a/helm/DEVEL/lablgtkmathview/gMathView.mli b/helm/DEVEL/lablgtkmathview/gMathView.mli index 57e622523..4f5f0d4e2 100644 --- a/helm/DEVEL/lablgtkmathview/gMathView.mli +++ b/helm/DEVEL/lablgtkmathview/gMathView.mli @@ -25,9 +25,10 @@ exception ErrorWritingFile of string exception ErrorLoadingDOM exception NoSelection class math_view_signals : - ([> `container | `widget] as 'b) Gtk.obj -> + ([> `container | `widget | `base | `math_view] as 'b) Gtk.obj -> object ('a) inherit GContainer.container_signals + val obj: 'b Gtk.obj method clicked : callback:(Gdome.element -> unit) -> GtkSignal.id method element_changed : callback:(Gdome.element option -> unit) -> GtkSignal.id diff --git a/helm/DEVEL/lablgtkmathview/gtkMathView.ml b/helm/DEVEL/lablgtkmathview/gtkMathView.ml index fb2cfc4e0..5d400bc59 100644 --- a/helm/DEVEL/lablgtkmathview/gtkMathView.ml +++ b/helm/DEVEL/lablgtkmathview/gtkMathView.ml @@ -120,7 +120,7 @@ module MathView = struct [GtkArgv.POINTER element] -> f (gdome_element_of_boxed_option element) | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_clicked" in - { name = "clicked"; marshaller = marshal_clicked } + { name = "clicked"; classe = `math_view; marshaller = marshal_clicked } let selection_changed : ([>`math_view],_) t = let marshal_selection_changed f _ = @@ -128,7 +128,8 @@ module MathView = struct [GtkArgv.POINTER element] -> f (gdome_element_option_of_boxed_option element) | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_selection_changed" in - { name = "selection_changed"; marshaller = marshal_selection_changed } + { name = "selection_changed"; classe = `math_view; + marshaller = marshal_selection_changed } let element_changed : ([>`math_view],_) t = let marshal_element_changed f _ = @@ -136,6 +137,7 @@ module MathView = struct [GtkArgv.POINTER element] -> f (gdome_element_option_of_boxed_option element) | _ -> invalid_arg "GtkMathView.MathView.Signals.marshal_element_changed" in - { name = "element_changed"; marshaller = marshal_element_changed } + { name = "element_changed"; classe = `math_view; + marshaller = marshal_element_changed } end end diff --git a/helm/DEVEL/lablgtkmathview/gtk_mathview.ml b/helm/DEVEL/lablgtkmathview/gtk_mathview.ml index a8ef3ea86..27ca4c45c 100644 --- a/helm/DEVEL/lablgtkmathview/gtk_mathview.ml +++ b/helm/DEVEL/lablgtkmathview/gtk_mathview.ml @@ -20,4 +20,4 @@ * For details, send a mail to the author. *) -type math_view = [`widget|`container|`bin|`eventbox|`math_view] +type math_view = [`widget|`container|`bin|`eventbox|`math_view|`base]