fixed some errers in the save/cancel ...

[helm.git] / helm / matita / matitaGtkMisc.ml

diff --git a/helm/matita/matitaGtkMisc.ml b/helm/matita/matitaGtkMisc.ml
index b8c9b91b3308b327ce14015248338a4ac0f9d17d..b0624241a8f140c11732a911cc2e960e8d508eb0 100644 (file)
--- a/helm/matita/matitaGtkMisc.ml
+++ b/helm/matita/matitaGtkMisc.ml
@@ -218,11 +218,15 @@ let popup_message_lowlevel
   hbox#pack ~from:`START ~expand:true ~fill:true (label:>GObj.widget);
   m#vbox#pack ~from:`START 
     ~padding:20 ~expand:true ~fill:true (hbox:>GObj.widget);
-  List.iter (fun (x,y) -> m#add_button_stock x y) buttons;
+  List.iter (fun (x, y) -> 
+    m#add_button_stock x y;
+    if y = `CANCEL then 
+      m#set_default_response y
+  ) buttons;
   ignore(m#connect#response 
     ~callback:(fun a ->  GMain.Main.quit ();callback a));
   ignore(m#connect#close 
-    ~callback:(fun _ -> GMain.Main.quit ();raise PopupClosed));
+    ~callback:(fun _ -> GMain.Main.quit ();callback `POPUPCLOSED));
   GtkThread.main ();
   m#destroy () 
 
@@ -235,14 +239,12 @@ let ask_confirmation ~title ~message ?parent () =
     | `NO -> rc := `NO
     | `CANCEL -> rc := `CANCEL
     | `DELETE_EVENT -> rc := `CANCEL
+    | `POPUPCLOSED -> rc := `CANCEL
   in
-  let buttons = [`CANCEL,`CANCEL ; `NO,`NO ; `YES,`YES] in
-  try
+  let buttons = [`YES,`YES ; `NO,`NO ; `CANCEL,`CANCEL] in
     popup_message_lowlevel 
       ~title ~message ~message_type:`WARNING ~callback ~buttons ?parent ();
     !rc
-  with
-  | PopupClosed -> `CANCEL
 
 let report_error ~title ~message ?parent () =
   let rc = ref false in