summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2008-04-02 03:55:38 (GMT)
committerdgp <dgp@users.sourceforge.net>2008-04-02 03:55:38 (GMT)
commita7fb3ccca3786f584d415e800a6ef4904d4d3ba9 (patch)
tree3fee0e42cb702c6dd134e9a98427556b1fa887b2 /generic
parent75e61094c52d15415001b986ab464880604da592 (diff)
downloadtk-a7fb3ccca3786f584d415e800a6ef4904d4d3ba9.zip
tk-a7fb3ccca3786f584d415e800a6ef4904d4d3ba9.tar.gz
tk-a7fb3ccca3786f584d415e800a6ef4904d4d3ba9.tar.bz2
* 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].
Diffstat (limited to 'generic')
-rw-r--r--generic/tkStubLib.c7
-rw-r--r--generic/tkWindow.c8
2 files changed, 7 insertions, 8 deletions
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
*/