summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2007-09-06 19:33:55 (GMT)
committerdgp <dgp@users.sourceforge.net>2007-09-06 19:33:55 (GMT)
commit9eeb6e7a4f32a9f04cd022da83bea178402826a0 (patch)
tree4aebeffff53b38e3d8e3842c7690bccefd435a3c /win
parent3ef61115ff6c1802994c2c0e59e140cf7f628220 (diff)
downloadtk-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 'win')
-rw-r--r--win/tkWinInit.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/win/tkWinInit.c b/win/tkWinInit.c
index 71c98af..cd187f7 100644
--- a/win/tkWinInit.c
+++ b/win/tkWinInit.c
@@ -9,17 +9,11 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkWinInit.c,v 1.12 2005/12/02 00:19:04 dkf Exp $
+ * RCS: @(#) $Id: tkWinInit.c,v 1.13 2007/09/06 19:34:02 dgp Exp $
*/
#include "tkWinInt.h"
-/*
- * The Init script (common to Windows and Unix platforms) is defined in
- * tkInitScript.h
- */
-
-#include "tkInitScript.h"
/*
*----------------------------------------------------------------------
@@ -49,7 +43,7 @@ TkpInit(
*/
TkWinXInit(Tk_GetHINSTANCE());
- return Tcl_Eval(interp, initScript);
+ return TCL_OK;
}
/*