From ed0c34adaed8a98ee5dc98e08810561ef81aa41c Mon Sep 17 00:00:00 2001 From: dgp Date: Thu, 14 Jun 2001 00:48:50 +0000 Subject: * mac/tclMacAppInit.c (main, Macintosh_Init): * mac/tclMacBOAAppInit.c (main): * mac/tclMacPanic.c: Applied patches from Dan Steffen correcting problems on the Macintosh in the 2001-06-08 changes. --- ChangeLog | 32 ++++++++++++++++++++++---------- mac/tclMacAppInit.c | 5 +++-- mac/tclMacBOAAppInit.c | 3 +-- mac/tclMacPanic.c | 7 +++++-- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a9c721..fc20053 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,33 +1,40 @@ +2001-06-13 Don Porter + + * mac/tclMacAppInit.c (main, Macintosh_Init): + * mac/tclMacBOAAppInit.c (main): + * mac/tclMacPanic.c: Applied patches from Dan Steffen correcting + problems on the Macintosh in the 2001-06-08 changes. + 2001-06-12 Donal K. Fellows * tests/regexp.test (regexp-18.12): * generic/tclCmdMZ.c (Tcl_RegexpObjCmd): Fixed so that submatches - that do not match always have index pair {-1 -1} [Bug #219232] + that do not match always have index pair {-1 -1} [Bug #219232] -2001-05-03 Don Porter +2001-06-08 Don Porter * generic/tcl.h: * generic/tcl.decls: * generic/tclPanic.c: Added CONST to Tcl_*Panic* public interfaces. - [Patch 415648, TIP 27] + [Patch 415648, TIP 27] * generic/tclInt.decls: * mac/tclMacAppInit.c (main): * mac/tclMacBOAAppInit.c (main): * mac/tclMacPanic.c: Modified special Mac implementations of - Tcl_*Panic* to be exact copies of the generic implementations. - Added TclMacSetPanic. The generic implementations should be - used directly, rather than copies, but that requires further - changes by someone familiar with the Mac build systems. - [Patch 415648] + Tcl_*Panic* to be exact copies of the generic implementations. + Added TclMacSetPanic. The generic implementations should be + used directly, rather than copies, but that requires further + changes by someone familiar with the Mac build systems. + [Patch 415648] * generic/tclDecls.h: * generic/tclIntPlatDecls.h: - *`generic/tclStubInit.c: `make gentubs` after above changes. + * generic/tclStubInit.c: `make gentubs` after above changes. * doc/Panic.3: * unix/mkLinks: New file documenting Tcl_*Panic* public interfaces, - followed by `make mklinks`. [Patch 415648, Bug 219170, Bug 414936] + followed by `make mklinks`. [Patch 415648, Bug 219170, Bug 414936] 2001-06-03 Jeff Hobbs @@ -666,6 +673,7 @@ in subspec value. 2001-03-26 Don Porter + * generic/tclDecls.h (Tcl_InitCustomHashTable): Correction to patch from 2001-01-18; tclDecls.h was not generated using 'make genstubs'. @@ -689,6 +697,7 @@ [unset] to agree with documentation, so must change test as well. 2001-03-14 Don Porter + * library/package.tcl (pkg_mkIndex): Added patch from Vince Darley to make [pkg_mkIndex -verbose] even more verbose. [Bug 219349, Patch 403529] @@ -757,10 +766,12 @@ mime package in tcllib. [Bug #131523] 2001-01-31 Don Porter + * win/makefile.vc (install-libraries): Corrected misdirected install directory for the msgcat 1.2 package. 2001-01-30 Don Porter + * generic/tclIO.c (CopyData): Moved code that updates the count of how many bytes are left to copy. Corrects bug that when writing occurs in the background, the copy loop could be @@ -805,6 +816,7 @@ between lists and strings. Fixes bug #119406 2001-01-04 Don Porter + * tests/unixInit.test: * unix/tclUnixInit.c (TclpInitLibraryPath): * win/tclWinInit.c (TclpInitLibraryPath): Several entries in diff --git a/mac/tclMacAppInit.c b/mac/tclMacAppInit.c index 7eaa6c7..1e83125 100644 --- a/mac/tclMacAppInit.c +++ b/mac/tclMacAppInit.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: tclMacAppInit.c,v 1.6 2001/06/08 20:06:11 dgp Exp $ + * RCS: @(#) $Id: tclMacAppInit.c,v 1.7 2001/06/14 00:48:51 dgp Exp $ */ #include "tcl.h" @@ -64,7 +64,6 @@ main( { char *newArgv[2]; - TclMacSetPanic(); if (MacintoshInit() != TCL_OK) { Tcl_Exit(1); } @@ -206,6 +205,8 @@ MacintoshInit() #endif + TclMacSetPanic(); + Tcl_MacSetEventProc((Tcl_MacConvertEventPtr) SIOUXHandleOneEvent); /* No problems with initialization */ diff --git a/mac/tclMacBOAAppInit.c b/mac/tclMacBOAAppInit.c index afdfbd5..0f7687b 100644 --- a/mac/tclMacBOAAppInit.c +++ b/mac/tclMacBOAAppInit.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: tclMacBOAAppInit.c,v 1.4 2001/06/08 20:06:11 dgp Exp $ + * RCS: @(#) $Id: tclMacBOAAppInit.c,v 1.5 2001/06/14 00:48:51 dgp Exp $ */ #include "tcl.h" @@ -75,7 +75,6 @@ main( { char *newArgv[3]; - TclMacSetPanic(); if (MacintoshInit() != TCL_OK) { Tcl_Exit(1); } diff --git a/mac/tclMacPanic.c b/mac/tclMacPanic.c index 06ae73e..896a633 100644 --- a/mac/tclMacPanic.c +++ b/mac/tclMacPanic.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: tclMacPanic.c,v 1.3 2001/06/08 20:06:11 dgp Exp $ + * RCS: @(#) $Id: tclMacPanic.c,v 1.4 2001/06/14 00:48:51 dgp Exp $ */ @@ -27,6 +27,9 @@ #include #include +#include "tclInt.h" +#include "tclMacInt.h" + /* * constants for panic dialog */ @@ -59,7 +62,7 @@ static void MacPanic _ANSI_ARGS_(TCL_VARARGS(CONST char *, format)); /* VARARGS ARGSUSED */ static void -MacPanic TCL_VARARGS_DEF(CONST char *, arg1) +MacPanic TCL_VARARGS_DEF(CONST char *, format) { va_list varg; char msg[256]; -- cgit v0.12