Attachment "3124554_tk.patch" to
ticket [3124554fff]
added by
nijtmans
2010-12-15 21:53:56.
### Eclipse Workspace Patch 1.0
#P tk8.6
Index: win/winMain.c
===================================================================
RCS file: /cvsroot/tktoolkit/tk/win/winMain.c,v
retrieving revision 1.40
diff -u -r1.40 winMain.c
--- win/winMain.c 24 Nov 2010 12:57:54 -0000 1.40
+++ win/winMain.c 15 Dec 2010 14:52:37 -0000
@@ -41,7 +41,6 @@
* Forward declarations for procedures defined later in this file:
*/
-static void WishPanic(const char *format, ...);
static BOOL consoleRequired = TRUE;
/*
@@ -108,8 +107,6 @@
int argc;
TCHAR *p;
- (Tcl_SetPanicProc)(WishPanic);
-
/*
* Create the console channels and install them as the standard channels.
* All I/O will be discarded until Tk_CreateConsoleWindow is called to
@@ -178,10 +175,10 @@
Tcl_Interp *interp) /* Interpreter for application. */
{
if ((Tcl_Init)(interp) == TCL_ERROR) {
- goto error;
+ return TCL_ERROR;
}
if (Tk_Init(interp) == TCL_ERROR) {
- goto error;
+ return TCL_ERROR;
}
Tcl_StaticPackage(interp, "Tk", Tk_Init, Tk_SafeInit);
@@ -192,24 +189,24 @@
if (consoleRequired) {
if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
- goto error;
+ return TCL_ERROR;
}
}
#if defined(STATIC_BUILD) && TCL_USE_STATIC_PACKAGES
if (Registry_Init(interp) == TCL_ERROR) {
- goto error;
+ return TCL_ERROR;
}
Tcl_StaticPackage(interp, "registry", Registry_Init, 0);
if (Dde_Init(interp) == TCL_ERROR) {
- goto error;
+ return TCL_ERROR;
}
Tcl_StaticPackage(interp, "dde", Dde_Init, Dde_SafeInit);
#endif
#ifdef TK_TEST
if (Tktest_Init(interp) == TCL_ERROR) {
- goto error;
+ return TCL_ERROR;
}
Tcl_StaticPackage(interp, "Tktest", Tktest_Init, 0);
#endif /* TK_TEST */
@@ -240,53 +237,6 @@
(Tcl_SetVar)(interp, "tcl_rcFileName", "~/wishrc.tcl", TCL_GLOBAL_ONLY);
return TCL_OK;
-
-error:
- MessageBeep(MB_ICONEXCLAMATION);
- TkpDisplayWarning((Tcl_GetStringResult)(interp), "Error in Wish");
-#ifdef _MSC_VER
- DebugBreak();
-#endif
- ExitProcess(1);
-
- /*
- * We won't reach this, but we need the return.
- */
-
- return TCL_ERROR;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * WishPanic --
- *
- * Display a message and exit.
- *
- * Results:
- * None.
- *
- * Side effects:
- * Exits the program.
- *
- *----------------------------------------------------------------------
- */
-
-void
-WishPanic(
- const char *format, ...)
-{
- va_list argList;
- char buf[1024];
-
- MessageBeep(MB_ICONEXCLAMATION);
- va_start(argList, format);
- vsprintf(buf, format, argList);
- TkpDisplayWarning(buf, "Fatal Error in Wish");
-#ifdef _MSC_VER
- DebugBreak();
-#endif
- ExitProcess(1);
}
#if !defined(TCL_BROKEN_MAINARGS) || defined(TK_TEST)
@@ -321,8 +271,6 @@
TCHAR **argv)
{
#endif
- (Tcl_SetPanicProc)(WishPanic);
-
/*
* Set up the default locale to be standard "C" locale so parsing is
* performed correctly.
