[Python-checkins] python/dist/src/PC/bdist_wininst install.c, 1.6, 1.7

Wed Jul 7 09:34:42 CEST 2004

Update of /cvsroot/python/python/dist/src/PC/bdist_wininst
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3918
Modified Files:
	install.c 
Log Message:
Remove the annoing and useless messagebox asking about overwriting files.
Fixes SF #984290.
Index: install.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/bdist_wininst/install.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** install.c	2 Jul 2004 23:53:16 -0000	1.6
--- install.c	7 Jul 2004 07:34:40 -0000	1.7
***************
*** 146,151 ****
 /* lParam: points to pathname */
 
- enum { UNSPECIFIED, ALWAYS, NEVER } allow_overwrite = UNSPECIFIED;
- 
 static BOOL notify(int code, char *fmt, ...);
 
--- 146,149 ----
***************
*** 809,834 ****
 }
 
- static BOOL AskOverwrite(char *filename)
- {
- 	int result;
- again:
- 	if (allow_overwrite == ALWAYS)
- 		return TRUE;
- 	if (allow_overwrite == NEVER)
- 		return FALSE;
- 	result = MessageBox(hDialog,
- 			 "Overwrite existing files?\n"
- 			 "\n"
- 			 "Press YES to ALWAYS overwrite existing files,\n"
- 			 "press NO to NEVER overwrite existing files.",
- 			 "Overwrite options",
- 			 MB_YESNO | MB_ICONQUESTION);
- 	if (result == IDYES)
- 		allow_overwrite = ALWAYS;
- 	else if (result == IDNO)
- 		allow_overwrite = NEVER;
- 	goto again;
- }
- 
 static BOOL notify (int code, char *fmt, ...)
 {
--- 807,810 ----
***************
*** 845,849 ****
 /* Questions */
 	case CAN_OVERWRITE:
- 		result = AskOverwrite(Buffer);
 		break;
 
--- 821,824 ----