summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-12-13 15:25:35 (GMT)
committernijtmans <nijtmans>2010-12-13 15:25:35 (GMT)
commit1163db68f3c029d63c522ada68ab47396fe37aba (patch)
treea3ca5553dbbf22b09cb625e81ff3027b1a54610d
parentd2674e76cf933113aa9181c43646b4fcc0313f42 (diff)
downloadtk-1163db68f3c029d63c522ada68ab47396fe37aba.zip
tk-1163db68f3c029d63c522ada68ab47396fe37aba.tar.gz
tk-1163db68f3c029d63c522ada68ab47396fe37aba.tar.bz2
Change "Application initialization failed" to "application-specific initialization failed", for consistency with Tcl.
-rw-r--r--ChangeLog3
-rw-r--r--generic/tkMain.c4
-rw-r--r--tests/main.test4
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index dc1e18a..5ada52f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2010-12-13 Jan Nijtmans <nijtmans@users.sf.net>
+ * generic/tkMain.c: Change "Application initialization failed" to
+ * tests/main.test: "application-specific initialization failed",
+ for consistency with Tcl.
* win/tkWin32Dll.c: See also: [Patch 1910041] and [Patch 3059922]. SEH emulation
on Win64 was not correct here: it sometimes results in a crash. Contrary to the
other places, the code here is not meant to protect from OS bugs, but to protect
diff --git a/generic/tkMain.c b/generic/tkMain.c
index d6b92da..740e07b 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMain.c,v 1.38 2010/11/24 11:14:15 nijtmans Exp $
+ * RCS: @(#) $Id: tkMain.c,v 1.39 2010/12/13 15:25:36 nijtmans Exp $
*/
/**
@@ -304,7 +304,7 @@ Tk_MainEx(
if (appInitProc(interp) != TCL_OK) {
TkpDisplayWarning(Tcl_GetStringResult(interp),
- "Application initialization failed");
+ "application-specific initialization failed");
}
/*
diff --git a/tests/main.test b/tests/main.test
index b7418e1..9f117f7 100644
--- a/tests/main.test
+++ b/tests/main.test
@@ -8,7 +8,7 @@
# Copyright (c) 1998-1999 by Scriptics Corporation.
# All rights reserved.
#
-# RCS: @(#) $Id: main.test,v 1.12 2008/08/12 22:52:23 aniap Exp $
+# RCS: @(#) $Id: main.test,v 1.13 2010/12/13 15:25:35 nijtmans Exp $
package require tcltest 2.2
namespace import ::tcltest::*
@@ -96,7 +96,7 @@ test main-2.3 {Tk_MainEx: -encoding option} -constraints stdio -setup {
test main-3.1 {Tk_ParseArgv: -help option} -constraints unix -body {
# Run only on unix as Win32 pops up native dialog
exec [interpreter] -help
-} -returnCodes error -match glob -result {% Application initialization failed: Command-specific options:*}
+} -returnCodes error -match glob -result {% application-specific initialization failed: Command-specific options:*}
test main-3.2 {Tk_ParseArgv: -help option} -setup {
set maininterp [interp create]