X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2FDEVEL%2Flablgtkmathview%2FgMathView.ml;h=57a6aa9a6a64dcc8b96b437f00b0dc9f57d84d48;hb=a83e0e4b2cf4d0cd378b5f2f451aa857507e0a01;hp=751674bbe92d9224ace7b2efed0587677c2b0624;hpb=30321de51742b359e6186b0388c183b2adb5e36a;p=helm.git diff --git a/helm/DEVEL/lablgtkmathview/gMathView.ml b/helm/DEVEL/lablgtkmathview/gMathView.ml index 751674bbe..57a6aa9a6 100644 --- a/helm/DEVEL/lablgtkmathview/gMathView.ml +++ b/helm/DEVEL/lablgtkmathview/gMathView.ml @@ -40,7 +40,7 @@ let option_element_of_option = | 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 = @@ -56,15 +56,14 @@ class math_view_skel obj = object 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_width = MathView.get_width obj - method get_height = MathView.get_height obj + method get_size = MathView.get_size obj method get_top = MathView.get_top 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_hadjustment = new GData.adjustment (MathView.get_hadjustment obj) - method get_vadjustment = new GData.adjustment (MathView.get_vadjustment obj) + 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_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_log_verbosity = MathView.set_log_verbosity obj @@ -72,8 +71,8 @@ class math_view_skel obj = object end class math_view_signals obj = object - inherit GContainer.container_signals_impl obj - inherit math_view_sigs + inherit GObj.widget_signals_impl obj + inherit math_view__g_meta_dom_sigs end class math_view obj = object @@ -82,7 +81,7 @@ class math_view obj = object end let math_view ?hadjustment ?vadjustment ?font_size ?log_verbosity = - GtkBase.Container.make_params ~cont:( + GtkBase.Widget.size_params ~cont:( OgtkMathViewProps.pack_return (fun p -> OgtkMathViewProps.set_params (new math_view (MathView.create p)) ~font_size ~log_verbosity)) [] ;;