4 files changed, 7 insertions, 6 deletions
diff --git a/otherlibs/labltk/browser/editor.ml b/otherlibs/labltk/browser/editor.ml
index fc8edbca6..70f02d33f 100644
--- a/otherlibs/labltk/browser/editor.ml
+++ b/otherlibs/labltk/browser/editor.ml
@@ -517,7 +517,7 @@ class editor ~top ~menus = object (self)
     bind top ~events:[`Destroy] ~breakable:true ~fields:[`Widget] ~action:
       begin fun ev ->
         if Widget.name ev.ev_Widget = Widget.name top
-        then self#quit ()
+        then (break (); self#quit ())
       end;
 
     (* File menu *)
diff --git a/otherlibs/labltk/browser/jg_message.ml b/otherlibs/labltk/browser/jg_message.ml
index 0de81640f..30d8d8154 100644
--- a/otherlibs/labltk/browser/jg_message.ml
+++ b/otherlibs/labltk/browser/jg_message.ml
@@ -84,7 +84,8 @@ let ask ~title ?master text =
       ~command:(fun () -> r := `yes; destroy tl) 
   and refuse = Button.create fw ~text:"No"
       ~command:(fun () -> r := `no; destroy tl)
-  and cancel = Jg_button.create_destroyer tl ~parent:fw ~text:"Cancel"
+  and cancel = Button.create fw ~text:"Cancel"
+      ~command:(fun () -> r := `cancel; destroy tl)
   in
   bind tl ~events:[`Destroy] ~extend:true
     ~action:(fun _ -> Textvariable.set sync "1");
diff --git a/otherlibs/labltk/browser/jg_toplevel.ml b/otherlibs/labltk/browser/jg_toplevel.ml
index 8b4fb1778..46fd376d2 100644
--- a/otherlibs/labltk/browser/jg_toplevel.ml
+++ b/otherlibs/labltk/browser/jg_toplevel.ml
@@ -18,7 +18,7 @@ open Tk
 let titled ?iconname title  =
   let iconname = match iconname with None -> title | Some s -> s in 
   let tl = Toplevel.create Widget.default_toplevel in
-  Wm.title_set tl ~title;
-  Wm.iconname_set tl ~name:iconname;
+  Wm.title_set tl title;
+  Wm.iconname_set tl iconname;
   Wm.group_set tl ~leader: Widget.default_toplevel;
   tl
diff --git a/otherlibs/labltk/browser/viewer.ml b/otherlibs/labltk/browser/viewer.ml
index 7ec4aad9e..4d7afb496 100644
--- a/otherlibs/labltk/browser/viewer.ml
+++ b/otherlibs/labltk/browser/viewer.ml
@@ -265,8 +265,8 @@ let f ?(dir=Unix.getcwd()) ?on () =
       let tl = Jg_toplevel.titled "Module viewer" in
       ignore (Jg_bind.escape_destroy tl); coe tl
   | Some top ->
-      Wm.title_set top ~title:"OCamlBrowser";
-      Wm.iconname_set top ~name:"OCamlBrowser";
+      Wm.title_set top "OCamlBrowser";
+      Wm.iconname_set top "OCamlBrowser";
       let tl = Frame.create top in
       pack [tl] ~expand:true ~fill:`Both;
       coe tl