diff options
| author | nijtmans <nijtmans> | 2010-11-24 10:34:18 (GMT) |
|---|---|---|
| committer | nijtmans <nijtmans> | 2010-11-24 10:34:18 (GMT) |
| commit | 10af58ae7a581a58b233d3edacbd5c11365684e8 (patch) | |
| tree | 42683cb8d360ac595906b2b8a4d81e842dc49f8d /win/winMain.c | |
| parent | c1eabb3837b46d3387543b02626d1877233d77cc (diff) | |
| download | tk-10af58ae7a581a58b233d3edacbd5c11365684e8.zip tk-10af58ae7a581a58b233d3edacbd5c11365684e8.tar.gz tk-10af58ae7a581a58b233d3edacbd5c11365684e8.tar.bz2 | |
re-write TkpDisplayWarning not to use any Tcl functions any more. This allows TkpDisplayWarning to be used as panic proc on Windows
Diffstat (limited to 'win/winMain.c')
| -rw-r--r-- | win/winMain.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/win/winMain.c b/win/winMain.c index 522d496..c679d81 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.38 2010/11/18 15:54:20 nijtmans Exp $ + * RCS: @(#) $Id: winMain.c,v 1.39 2010/11/24 10:34:18 nijtmans Exp $ */ #include "tk.h" @@ -35,13 +35,13 @@ 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; /* @@ -277,15 +277,11 @@ WishPanic( { va_list argList; char buf[1024]; - Tcl_DString ds; MessageBeep(MB_ICONEXCLAMATION); va_start(argList, format); vsprintf(buf, format, argList); - Tcl_WinUtfToTChar(buf, -1, &ds); - MessageBox(NULL, (TCHAR *)Tcl_DStringValue(&ds), TEXT("Error in Wish"), - MB_ICONSTOP | MB_OK | MB_TASKMODAL | MB_SETFOREGROUND); - Tcl_DStringFree(&ds); + TkpDisplayWarning(buf, "Error in Wish"); #ifdef _MSC_VER DebugBreak(); #endif |