* 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].

2 files changed, 5 insertions, 12 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 34f00b8..4e2e8fa 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.135 2007/09/05 01:39:45 das Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.136 2007/09/06 19:34:02 dgp Exp $
 
 # Current Tk version;  used in various names.
 
@@ -1167,7 +1167,7 @@ tkUnixFont.o: $(UNIX_DIR)/tkUnixFont.c
 tkUnixRFont.o: $(UNIX_DIR)/tkUnixRFont.c
 	$(CC) -c $(CC_SWITCHES) $(XFT_CFLAGS) $(UNIX_DIR)/tkUnixRFont.c
 
-tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c $(GENERIC_DIR)/tkInitScript.h tkConfig.sh
+tkUnixInit.o: $(UNIX_DIR)/tkUnixInit.c tkConfig.sh
 	$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
 	    $(UNIX_DIR)/tkUnixInit.c
 
@@ -1243,7 +1243,7 @@ tkMacOSXFont.o: $(MAC_OSX_DIR)/tkMacOSXFont.c
 tkMacOSXHLEvents.o: $(MAC_OSX_DIR)/tkMacOSXHLEvents.c
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXHLEvents.c
 
-tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c $(GENERIC_DIR)/tkInitScript.h tkConfig.sh
+tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c tkConfig.sh
 	$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
 	    $(MAC_OSX_DIR)/tkMacOSXInit.c
 
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;
 }
 
 /*