summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>1999-11-03 00:43:09 (GMT)
committerhobbs <hobbs>1999-11-03 00:43:09 (GMT)
commita0aea84bcfa5f2c75e799cbd2b9c3a4511865feb (patch)
treeafa01ae751f757baaf68f2ebe0b9fb7cbb192661
parent9ea05101abb269486d245389db9f651abe80e08b (diff)
downloadtk-a0aea84bcfa5f2c75e799cbd2b9c3a4511865feb.zip
tk-a0aea84bcfa5f2c75e799cbd2b9c3a4511865feb.tar.gz
tk-a0aea84bcfa5f2c75e799cbd2b9c3a4511865feb.tar.bz2
* win/winMain.c: changed Tcl_AppInit to not cause a DebugBreak
on simple startup errors (like bad options to wish)
-rw-r--r--win/winMain.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/win/winMain.c b/win/winMain.c
index 54cda5f..5d26994 100644
--- a/win/winMain.c
+++ b/win/winMain.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: winMain.c,v 1.7 1999/04/28 18:18:07 redman Exp $
+ * RCS: @(#) $Id: winMain.c,v 1.7.6.1 1999/11/03 00:43:09 hobbs Exp $
*/
#include <tk.h>
@@ -171,7 +171,11 @@ Tcl_AppInit(interp)
return TCL_OK;
error:
- WishPanic(Tcl_GetStringResult(interp));
+ MessageBeep(MB_ICONEXCLAMATION);
+ MessageBox(NULL, Tcl_GetStringResult(interp), "Error in Wish",
+ MB_ICONSTOP | MB_OK | MB_TASKMODAL | MB_SETFOREGROUND);
+ ExitProcess(1);
+ /* we won't reach this, but we need the return */
return TCL_ERROR;
}
@@ -209,6 +213,7 @@ WishPanic TCL_VARARGS_DEF(char *,arg1)
#endif
ExitProcess(1);
}
+
/*
*-------------------------------------------------------------------------
*
@@ -325,7 +330,6 @@ setargv(argcPtr, argvPtr)
*argcPtr = argc;
*argvPtr = argv;
}
-
/*
*----------------------------------------------------------------------