diff options
| author | Hugo Herbelin | 2019-02-07 16:54:11 +0100 |
|---|---|---|
| committer | Vincent Laporte | 2019-03-19 08:40:21 +0000 |
| commit | 4d69a22ffa06005b11040c9db9064a1d730eeb7f (patch) | |
| tree | 548a617e30615d1464ce5094d0f6ea0ccf87f98c /ide | |
| parent | 73847d367b22b5d451bcf1e538b80ca057232754 (diff) | |
Fix for post-beta3 lablgtk3 changes about cairo (from Claudio).
Diffstat (limited to 'ide')
| -rw-r--r-- | ide/coqide.ml | 2 | ||||
| -rw-r--r-- | ide/wg_Command.ml | 2 | ||||
| -rw-r--r-- | ide/wg_MessageView.ml | 2 | ||||
| -rw-r--r-- | ide/wg_ProofView.ml | 2 | ||||
| -rw-r--r-- | ide/wg_ScriptView.ml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ide/coqide.ml b/ide/coqide.ml index 49ff53eda1..eaeeaa0001 100644 --- a/ide/coqide.ml +++ b/ide/coqide.ml @@ -813,7 +813,7 @@ let zoom_fit sn = let space = script#misc#allocation.Gtk.width in let cols = script#right_margin_position in let pango_ctx = script#misc#pango_context in - let layout = pango_ctx#create_layout in + let layout = pango_ctx#create_layout#as_layout in let fsize = Pango.Font.get_size (Pango.Font.from_string text_font#get) in Pango.Layout.set_text layout (String.make cols 'X'); let tlen = fst (Pango.Layout.get_pixel_size layout) in diff --git a/ide/wg_Command.ml b/ide/wg_Command.ml index dce2a0726b..be400a5f2d 100644 --- a/ide/wg_Command.ml +++ b/ide/wg_Command.ml @@ -103,7 +103,7 @@ object(self) let cb clr = result#misc#modify_bg [`NORMAL, `NAME clr] in let _ = background_color#connect#changed ~callback:cb in let _ = result#misc#connect#realize ~callback:(fun () -> cb background_color#get) in - let cb ft = result#misc#modify_font (Pango.Font.from_string ft) in + let cb ft = result#misc#modify_font (GPango.font_description_from_string ft) in stick text_font result cb; result#misc#set_can_focus true; (* false causes problems for selection *) let callback () = diff --git a/ide/wg_MessageView.ml b/ide/wg_MessageView.ml index fd69d5e623..7943b099fc 100644 --- a/ide/wg_MessageView.ml +++ b/ide/wg_MessageView.ml @@ -62,7 +62,7 @@ let message_view () : message_view = let cb clr = view#misc#modify_bg [`NORMAL, `NAME clr] in let _ = background_color#connect#changed ~callback:cb in let _ = view#misc#connect#realize ~callback:(fun () -> cb background_color#get) in - let cb ft = view#misc#modify_font (Pango.Font.from_string ft) in + let cb ft = view#misc#modify_font (GPango.font_description_from_string ft) in stick text_font view cb; (* Inserts at point, advances the mark *) diff --git a/ide/wg_ProofView.ml b/ide/wg_ProofView.ml index beeba4ade6..596df227b7 100644 --- a/ide/wg_ProofView.ml +++ b/ide/wg_ProofView.ml @@ -207,7 +207,7 @@ let proof_view () = let cb clr = view#misc#modify_bg [`NORMAL, `NAME clr] in let _ = background_color#connect#changed ~callback:cb in let _ = view#misc#connect#realize ~callback:(fun () -> cb background_color#get) in - let cb ft = view#misc#modify_font (Pango.Font.from_string ft) in + let cb ft = view#misc#modify_font (GPango.font_description_from_string ft) in stick text_font view cb; let pf = object diff --git a/ide/wg_ScriptView.ml b/ide/wg_ScriptView.ml index 7812f1a222..e95176bf4d 100644 --- a/ide/wg_ScriptView.ml +++ b/ide/wg_ScriptView.ml @@ -484,7 +484,7 @@ object (self) stick tab_length self self#set_tab_width; stick auto_complete self self#set_auto_complete; - let cb ft = self#misc#modify_font (Pango.Font.from_string ft) in + let cb ft = self#misc#modify_font (GPango.font_description_from_string ft) in stick text_font self cb; () |