* generic/tkWindow.c: Revised package initialization so that

        * unix/Makefile.in:     "tkStubsPtr" is not present in libtk.so, but
        is present only in libtkstub.a.  This tightens up the rules for users
        of the stubs interfaces.  [Tcl Bug 1819422].

4 files changed, 15 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index 47e1053..932f1d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-04-01  Don Porter  <dgp@users.sourceforge.net>
 
+	* generic/tkWindow.c:	Revised package initialization so that 
+	* unix/Makefile.in:	"tkStubsPtr" is not present in libtk.so, but
+	is present only in libtkstub.a.  This tightens up the rules for users
+	of the stubs interfaces.  [Tcl Bug 1819422].
+
 	* README:		Bump version number to 8.6a0
 	* generic/tk.h:
 	* library/tk.tcl:
@@ -17,9 +22,6 @@
 	* generic/tkMain.c:	might [load] into a Tcl 8.5 interp.
 	* generic/tkWindow.c:
 
-	* generic/tkStubLib.c:	Update to compatibility with a libtcl.so
-	that contains no "tclStubsPtr" [Tcl Bug 1819422].
-
 	* generic/tkDecls.h:		make genstubs
 	* generic/tkIntDecls.h:
 	* generic/tkIntPlatDecls.h:
diff --git a/generic/tkStubLib.c b/generic/tkStubLib.c
index e54c3ef..e38d63d 100644
--- a/generic/tkStubLib.c
+++ b/generic/tkStubLib.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkStubLib.c,v 1.21 2008/04/01 16:30:54 dgp Exp $
+ * RCS: @(#) $Id: tkStubLib.c,v 1.22 2008/04/02 03:55:39 dgp Exp $
  */
 
 /*
@@ -20,6 +20,11 @@
  * including the rest of the stub functions.
  */
 
+#ifndef USE_TCL_STUBS
+#define USE_TCL_STUBS
+#endif
+#undef USE_TCL_STUB_PROCS
+
 #ifndef USE_TK_STUBS
 #define USE_TK_STUBS
 #endif
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
index 4063819..9be8885 100644
--- a/generic/tkWindow.c
+++ b/generic/tkWindow.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: tkWindow.c,v 1.90 2008/04/01 16:30:54 dgp Exp $
+ * RCS: @(#) $Id: tkWindow.c,v 1.91 2008/04/02 03:55:39 dgp Exp $
  */
 
 #include "tkInt.h"
@@ -3205,12 +3205,6 @@ Initialize(
 
     Tcl_SetMainLoop(Tk_MainLoop);
 
-#ifdef Tk_InitStubs
-#undef Tk_InitStubs
-#endif
-
-    Tk_InitStubs(interp, TK_VERSION, 1);
-
     /*
      * Initialized the themed widget set
      */
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 96df504..ee34dec 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.143 2008/03/21 21:49:12 jenglish Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.144 2008/04/02 03:55:39 dgp Exp $
 
 # Current Tk version;  used in various names.
 
@@ -372,7 +372,7 @@ TTK_OBJS = \
 	ttkTagSet.o ttkTheme.o ttkTrace.o ttkTrack.o ttkTreeview.o \
 	ttkWidget.o ttkStubInit.o
 
-STUB_OBJS = tkStubInit.o tkStubLib.o
+STUB_OBJS = tkStubInit.o
 
 STUB_LIB_OBJS = tkStubLib.o ttkStubLib.o
 
@@ -446,7 +446,7 @@ GENERIC_SRCS = \
 	$(GENERIC_DIR)/tkTextTag.c $(GENERIC_DIR)/tkTextWind.c \
 	$(GENERIC_DIR)/tkOldConfig.c $(GENERIC_DIR)/tkOldTest.c \
 	$(GENERIC_DIR)/tkSquare.c $(GENERIC_DIR)/tkTest.c \
-	$(GENERIC_DIR)/tkStubInit.c $(GENERIC_DIR)/tkStubLib.c
+	$(GENERIC_DIR)/tkStubInit.c
 
 TTK_SRCS = \
 	$(TTK_DIR)/ttkBlink.c \