diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-09-06 19:33:55 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-09-06 19:33:55 (GMT) |
| commit | 9eeb6e7a4f32a9f04cd022da83bea178402826a0 (patch) | |
| tree | 4aebeffff53b38e3d8e3842c7690bccefd435a3c /macosx | |
| parent | 3ef61115ff6c1802994c2c0e59e140cf7f628220 (diff) | |
| download | tk-9eeb6e7a4f32a9f04cd022da83bea178402826a0.zip tk-9eeb6e7a4f32a9f04cd022da83bea178402826a0.tar.gz tk-9eeb6e7a4f32a9f04cd022da83bea178402826a0.tar.bz2 | |
* generic/tkWindow.c (Initialize): Moved common Tk initialization
* generic/tkInitScript.h (removed): script out of tkInitScript.h
* macosx/tkMacOSXInit.c: and multiple TkpInit() routines and
* unix/Makefile.in: into the common Initialize() routine in
* unix/tkUnixInit.c: generic code. Also removed constraint on
* win/tkWinInit.c: ability to define a custom [tkInit] before
calling Tk_Init(). Until now the custom [tkInit] had to be a proc.
Now it can be any command. Removal of tkInitScript.h also fixes
[Bug 1656283].
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/tkMacOSXInit.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c index bf6ef38..615b35d 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.32 2007/06/29 03:20:01 das Exp $ + * RCS: @(#) $Id: tkMacOSXInit.c,v 1.33 2007/09/06 19:33:56 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; } /* |