Bug fix for #2875562

4 files changed, 21 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 622fe58..c137173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-21  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* win/Makefile.in:     Bug fix for #2875562
+	* win/winMain.c:       Make sure that winMain.c and tkAppInit.c
+	* unix/tkAppInit.c     are never compiled with stubs.
+
 2009-10-20  Don Porter  <dgp@users.sourceforge.net>
 
 	* unix/Makefile.in:	Compiling Tk no longer requires header files
diff --git a/unix/tkAppInit.c b/unix/tkAppInit.c
index 9ae77f1..8822340 100644
--- a/unix/tkAppInit.c
+++ b/unix/tkAppInit.c
@@ -10,9 +10,12 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkAppInit.c,v 1.9 2008/04/27 22:39:12 dkf Exp $
+ * RCS: @(#) $Id: tkAppInit.c,v 1.10 2009/10/21 20:28:54 nijtmans Exp $
  */
 
+/* Make sure this file is never compiled with Stubs! */
+#undef USE_TCL_STUBS
+#undef USE_TK_STUBS
 #include "tk.h"
 #include "locale.h"
 
diff --git a/win/Makefile.in b/win/Makefile.in
index f73db98..919ad26 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.84 2009/10/20 16:57:25 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.85 2009/10/21 20:28:52 nijtmans Exp $
 
 TCLVERSION		= @TCL_VERSION@
 TCLPATCHL		= @TCL_PATCH_LEVEL@
@@ -208,14 +208,11 @@ TCL_EXE			= @TCLSH_PROG@
 CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 -I"${GENERIC_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \
 -I"${XLIB_DIR_NATIVE}" -I"${BITMAP_DIR_NATIVE}" \
--I"${TCL_GENERIC_NATIVE}" ${AC_FLAGS}
+-I"${TCL_GENERIC_NATIVE}" ${AC_FLAGS} -DUSE_TCL_STUBS
 
 CC_OBJNAME = @CC_OBJNAME@
 CC_EXENAME = @CC_EXENAME@
 
-STUB_CC_SWITCHES	= ${CC_SWITCHES} -DUSE_TCL_STUBS
-CON_CC_SWITCHES		= ${CC_SWITCHES} -DCONSOLE
-
 # Tk used to let the configure script choose which program to use
 # for installing, but there are just too many different versions of
 # "install" around;  better to use the install-sh script that comes
@@ -594,14 +591,15 @@ install-private-headers: libraries
 	    done;
 
 $(WISH): $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) $(WISH_OBJS) wish.$(RES)
-	$(CC) $(CFLAGS) $(WISH_OBJS) $(TCL_LIB_FILE) $(TK_LIB_FILE) $(LIBS) \
+	$(CC) $(CFLAGS) $(WISH_OBJS) $(TK_LIB_FILE) \
+	$(TCL_STUB_LIB_FILE) $(TCL_LIB_FILE) $(LIBS) \
 	wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW)
 
 tktest : $(TKTEST)
 
 $(TKTEST): $(TK_LIB_FILE) $(TKTEST_OBJS) wish.$(RES) $(CAT32)
-	$(CC) $(CFLAGS) $(TKTEST_OBJS) $(TCL_LIB_FILE) \
-	$(TK_LIB_FILE) $(LIBS) \
+	$(CC) $(CFLAGS) $(TKTEST_OBJS) $(TK_LIB_FILE) \
+	$(TCL_STUB_LIB_FILE) $(TCL_LIB_FILE) $(LIBS) \
 	wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW)
 
 # Msys make requires this next rule for some reason.
@@ -665,7 +663,7 @@ tkWindow.$(OBJEXT): configure Makefile
 # Implicit rule for all object files that will end up in the Tcl library
 
 .c.$(OBJEXT):
-	$(CC) -c $(STUB_CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME)
+	$(CC) -c $(CC_SWITCHES) -DBUILD_tk -DBUILD_ttk @DEPARG@ $(CC_OBJNAME)
 
 .rc.$(RES):
 	$(RC) @RC_OUT@ $@ @RC_TYPE@ @RC_DEFINES@ @RC_INCLUDE@ "$(GENERIC_DIR_NATIVE)" @RC_INCLUDE@ "$(TCL_GENERIC_NATIVE)" @RC_INCLUDE@ "$(RC_DIR_NATIVE)" @DEPARG@
diff --git a/win/winMain.c b/win/winMain.c
index c75c22c..5b914b1 100644
--- a/win/winMain.c
+++ b/win/winMain.c
@@ -9,9 +9,12 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: winMain.c,v 1.27 2008/04/27 22:39:17 dkf Exp $
+ * RCS: @(#) $Id: winMain.c,v 1.28 2009/10/21 20:28:52 nijtmans Exp $
  */
 
+/* Make sure this file is never compiled with Stubs! */
+#undef USE_TCL_STUBS
+#undef USE_TK_STUBS
 #include "tkInt.h"
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>