summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-09-07 01:25:33 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-09-07 01:25:33 (GMT)
commite49fac5b1a1937d9253af474812ecaec6771fe39 (patch)
tree43ac69bc3a595087f47f047e823a04bc05f0bded /macosx
parent17c3b9129b6d86c739d3240afef617a7fb5eee59 (diff)
downloadtk-e49fac5b1a1937d9253af474812ecaec6771fe39.zip
tk-e49fac5b1a1937d9253af474812ecaec6771fe39.tar.gz
tk-e49fac5b1a1937d9253af474812ecaec6771fe39.tar.bz2
merge updates from HEAD
Diffstat (limited to 'macosx')
-rw-r--r--macosx/tkMacOSXInit.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index e6052fe..ed06f25 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.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: tkMacOSXInit.c,v 1.28.2.3 2007/07/01 17:31:33 dgp Exp $
+ * RCS: @(#) $Id: tkMacOSXInit.c,v 1.28.2.4 2007/09/07 01:25:37 dgp Exp $
*/
#include "tkMacOSXPrivate.h"
@@ -24,12 +24,6 @@
#include <mach-o/getsect.h>
/*
- * The Init script (common to Windows and Unix platforms) is
- * defined in tkInitScript.h
- */
-#include "tkInitScript.h"
-
-/*
* Define the following to 0 to not attempt to use an undocumented SPI
* to notify the window server that an unbundled executable is a full
* GUI application after loading Tk.
@@ -387,7 +381,7 @@ TkpInit(
TCL_GLOBAL_ONLY|TCL_LIST_ELEMENT|TCL_APPEND_VALUE);
}
- return Tcl_EvalEx(interp, initScript, -1, TCL_EVAL_GLOBAL);
+ return TCL_OK;
}
/*