From 24339a677942f89a92af244fa2eb83c0132f53d1 Mon Sep 17 00:00:00 2001
From: jnarboux
Date: Thu, 29 May 2008 15:39:24 +0000
Subject: backtrack sur utilisation de do_overwrite_confirmation

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@11020 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 ide/coqide.ml   | 11 ++++++-----
 ide/ideutils.ml |  4 +++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ide/coqide.ml b/ide/coqide.ml
index a7618c97b4..dd807443b3 100644
--- a/ide/coqide.ml
+++ b/ide/coqide.ml
@@ -153,6 +153,7 @@ object('self)
   method revert : unit
   method auto_save : unit
   method save : string -> bool
+  method save_as : string -> bool
   method read_only : bool
   method set_read_only : bool -> unit
   method is_active : bool
@@ -717,7 +718,7 @@ object(self)
 		warning ("Autosave: unexpected error while writing "^fn)
       end	      
       
-(*  method save_as f =
+  method save_as f =
     if Sys.file_exists f then 
       match (GToolbox.question_box ~title:"File exists on disk"
 	       ~buttons:["Overwrite";
@@ -733,7 +734,7 @@ object(self)
       with 1 -> self#save f
 	| _ -> false
     else self#save f
-*)
+
   method set_read_only b = read_only<-b
   method read_only = read_only
   method is_active = is_active
@@ -1953,7 +1954,7 @@ let main files =
 		       with
 			 | None -> ()
 			 | Some f -> 
-			     if (Option.get current.analyzed_view)#save f then begin
+			     if (Option.get current.analyzed_view)#save_as f then begin
 				 set_current_tab_label (Filename.basename f);
 				 !flash_info ("File " ^ f ^ " saved")
 			       end
@@ -1981,7 +1982,7 @@ let main files =
 			   with
 			     | None -> ()
 			     | Some f -> 
-				 if (Option.get current.analyzed_view)#save f then begin
+				 if (Option.get current.analyzed_view)#save_as f then begin
 				     set_current_tab_label (Filename.basename f);
 				     !flash_info "Saved"
 				   end
@@ -1995,7 +1996,7 @@ let main files =
 			   with
 			     | None -> ()
 			     | Some f -> 
-				 if (Option.get current.analyzed_view)#save f then begin
+				 if (Option.get current.analyzed_view)#save_as f then begin
 				     set_current_tab_label (Filename.basename f);
 				     !flash_info "Saved"
 				   end else !flash_info "Save Failed"
diff --git a/ide/ideutils.ml b/ide/ideutils.ml
index c4c2c0da82..6a4833ec88 100644
--- a/ide/ideutils.ml
+++ b/ide/ideutils.ml
@@ -205,7 +205,9 @@ let select_file_for_save ~title ?(dir = last_dir) ?(filename="") () =
     file_chooser#add_select_button_stock `SAVE `SAVE ;
     file_chooser#add_filter (filter_coq_files ());
     file_chooser#add_filter (filter_all_files ());
-(*    file_chooser#set_do_overwrite_confirmation true;*)
+  (* this line will be used when a lablgtk >= 2.10.0 is the default on most distributions  
+       file_chooser#set_do_overwrite_confirmation true;
+     *)
     ignore (file_chooser#set_current_folder !dir);
     ignore (file_chooser#set_current_name filename);
     
-- 
cgit v1.2.3