diff options
| author | dgp@users.sourceforge.net <dgp> | 2007-09-06 19:33:55 (GMT) |
|---|---|---|
| committer | dgp@users.sourceforge.net <dgp> | 2007-09-06 19:33:55 (GMT) |
| commit | 52f0330d9f455fd60a83affa32cdc459a64c2164 (patch) | |
| tree | 4aebeffff53b38e3d8e3842c7690bccefd435a3c /unix/tkUnixInit.c | |
| parent | eb7d3fe773e00b4669c883ecac98ea45d8fd8e66 (diff) | |
| download | tk-52f0330d9f455fd60a83affa32cdc459a64c2164.zip tk-52f0330d9f455fd60a83affa32cdc459a64c2164.tar.gz tk-52f0330d9f455fd60a83affa32cdc459a64c2164.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 'unix/tkUnixInit.c')
| -rw-r--r-- | unix/tkUnixInit.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/unix/tkUnixInit.c b/unix/tkUnixInit.c index 4fbef46..b493c2a 100644 --- a/unix/tkUnixInit.c +++ b/unix/tkUnixInit.c @@ -8,19 +8,12 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkUnixInit.c,v 1.7 2005/11/14 11:54:21 dkf Exp $ + * RCS: @(#) $Id: tkUnixInit.c,v 1.8 2007/09/06 19:34:02 dgp Exp $ */ #include "tkInt.h" #include "tkUnixInt.h" -/* - * The Init script (common to Windows and Unix platforms) is defined in - * tkInitScript.h - */ - -#include "tkInitScript.h" - #ifdef HAVE_COREFOUNDATION static int GetLibraryPath(Tcl_Interp *interp); #else @@ -51,7 +44,7 @@ TkpInit( { TkCreateXEventSource(); GetLibraryPath(interp); - return Tcl_Eval(interp, initScript); + return TCL_OK; } /* |