summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordas <das>2005-01-25 06:54:17 (GMT)
committerdas <das>2005-01-25 06:54:17 (GMT)
commit87bbe51a83e60a0209fee4610ef2fa148f7178d8 (patch)
tree115a1055406214260386854f5102651d208e3553 /macosx
parent2ce1d23eb6b0a4170b95fe9526132dffd6fe2b5a (diff)
downloadtk-87bbe51a83e60a0209fee4610ef2fa148f7178d8.zip
tk-87bbe51a83e60a0209fee4610ef2fa148f7178d8.tar.gz
tk-87bbe51a83e60a0209fee4610ef2fa148f7178d8.tar.bz2
* macosx/tkMacOSXInit.c (TkpInit): set tcl_interactive to 1 to show
console at startup instead of directly calling [console show]. * unix/tcl.m4 (Darwin): fixed bug with static build linking to dynamic library in /usr/lib etc instead of linking to static library earlier in search path. [Tcl Bug 956908] Removed obsolete references to Rhapsody. * unix/configure: autoconf-2.57
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXInit.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 07127eb..b7acd4f 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXInit.c,v 1.6 2004/11/11 01:24:32 das Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.7 2005/01/25 06:54:18 das Exp $
*/
#include "tkInt.h"
@@ -174,11 +174,12 @@ TkpInit(interp)
Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDIN));
Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDOUT));
Tcl_RegisterChannel(interp, Tcl_GetStdChannel(TCL_STDERR));
- if (Tk_CreateConsoleWindow(interp) == TCL_OK) {
- /* Only show the console if we don't have a startup script */
- if (Tcl_GetStartupScript(NULL) == NULL) {
- Tcl_Eval(interp, "console show");
- }
+ /* Only show the console if we don't have a startup script */
+ if (Tcl_GetStartupScript(NULL) == NULL) {
+ Tcl_SetVar(interp, "tcl_interactive", "1", TCL_GLOBAL_ONLY);
+ }
+ if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
+ return TCL_ERROR;
}
}
}