diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | generic/tk.h | 8 | ||||
| -rw-r--r-- | win/winMain.c | 77 |
3 files changed, 20 insertions, 71 deletions
@@ -1,3 +1,9 @@ +2010-12-16 Jan Nijtmans <nijtmans@users.sf.net> + + * generic/tk.h: [Patch 3124554]: Move WishPanic from Tk to Tcl + * win/winMain.c: Remove special MessageBox'es here, since every + panic-related thing is now handled correctly by Tcl. + 2010-12-15 Stuart Cassoff <stwo@users.sourceforge.net> * unix/Makefile.in: Installer Improvements. diff --git a/generic/tk.h b/generic/tk.h index f4c3cdb..cb77f86 100644 --- a/generic/tk.h +++ b/generic/tk.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tk.h,v 1.137 2010/08/19 05:23:12 nijtmans Exp $ + * RCS: @(#) $Id: tk.h,v 1.138 2010/12/16 09:03:07 nijtmans Exp $ */ #ifndef _TK @@ -1473,9 +1473,13 @@ typedef struct Tk_ElementSpec { #define Tk_Release Tcl_Release /* Removed Tk_Main, use macro instead */ +#ifdef _WIN32 +#define Tk_Main(argc, argv, proc) Tk_MainEx(argc, argv, proc, \ + (Tcl_FindExecutable(0), (Tcl_CreateInterp)())) +#else #define Tk_Main(argc, argv, proc) Tk_MainEx(argc, argv, proc, \ (Tcl_FindExecutable(argv[0]), (Tcl_CreateInterp)())) - +#endif const char * Tk_InitStubs(Tcl_Interp *interp, const char *version, int exact); EXTERN const char * Tk_PkgInitStubsCheck(Tcl_Interp *interp, diff --git a/win/winMain.c b/win/winMain.c index 2525972..c6591c5 100644 --- a/win/winMain.c +++ b/win/winMain.c @@ -11,7 +11,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.40 2010/11/24 12:57:54 nijtmans Exp $ + * RCS: @(#) $Id: winMain.c,v 1.41 2010/12/16 09:03:07 nijtmans Exp $ */ #include "tk.h" @@ -35,13 +35,11 @@ extern Tcl_PackageInitProc Dde_SafeInit; #ifdef TCL_BROKEN_MAINARGS static void setargv(int *argcPtr, TCHAR ***argvPtr); #endif -extern void TkpDisplayWarning(const char *, const char *); /* * Forward declarations for procedures defined later in this file: */ -static void WishPanic(const char *format, ...); static BOOL consoleRequired = TRUE; /* @@ -81,14 +79,6 @@ extern int TK_LOCAL_MAIN_HOOK(int *argc, TCHAR ***argv); *---------------------------------------------------------------------- */ -#ifdef UNICODE -/* workaround for bug in some versions of mingw32-w64 */ -# undef _tWinMain -# define _tWinMain wWinMain -# undef __targv -# define __targv __wargv -#endif - int APIENTRY #ifdef TCL_BROKEN_MAINARGS WinMain( @@ -108,8 +98,6 @@ _tWinMain( 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 +166,10 @@ Tcl_AppInit( 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 +180,24 @@ Tcl_AppInit( 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,56 +228,9 @@ Tcl_AppInit( (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) +#if defined(__CYGWIN__) || defined(TK_TEST) /* *---------------------------------------------------------------------- * @@ -321,8 +262,6 @@ _tmain( TCHAR **argv) { #endif - (Tcl_SetPanicProc)(WishPanic); - /* * Set up the default locale to be standard "C" locale so parsing is * performed correctly. |