summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorstanton <stanton@noemail.net>1999-07-09 02:10:05 (GMT)
committerstanton <stanton@noemail.net>1999-07-09 02:10:05 (GMT)
commit45f783e0465a374ecd455fc50dc61787d681cb8c (patch)
treef32d3cdbac2a0bb71ca1b98f0d2b2676d544898c /win
parent6c9f55dd0aea5a891894337b0370cc1081e9bf94 (diff)
downloadtk-45f783e0465a374ecd455fc50dc61787d681cb8c.zip
tk-45f783e0465a374ecd455fc50dc61787d681cb8c.tar.gz
tk-45f783e0465a374ecd455fc50dc61787d681cb8c.tar.bz2
* tests/unixSelect.test: Fixed broken test.
* win/makefile.vc: Added special case target to ensure that tkStubLib.obj is built with -DSTATIC_BUILD. * win/tkWinX.c (TkWinChildProc): Changed to pass WM_WINDOWPOSCHANGED through to DefWindowProc to make OpenGL sub-windows happy. This allows Windows to generate the WM_SIZE and WM_MOVE messages. FossilOrigin-Name: bc661b9f3a4ccb0207118496cfb6dace7bc92482
Diffstat (limited to 'win')
-rw-r--r--win/makefile.vc5
-rw-r--r--win/tkWinX.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 495b73b..58f111b 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -4,7 +4,7 @@
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
# Copyright (c) 1995-1997 Sun Microsystems, Inc.
-# RCS: @(#) $Id: makefile.vc,v 1.25 1999/06/25 23:30:27 welch Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.26 1999/07/09 02:10:07 stanton Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -461,6 +461,9 @@ $(TMPDIR)\tkSquare.obj: $(ROOT)\generic\tkSquare.c
$(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c
$(cc32) $(WISH_CFLAGS) -Fo$@ $?
+$(TMPDIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c
+ $(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -Fo$@ $?
+
#
# Implicit rules
#
diff --git a/win/tkWinX.c b/win/tkWinX.c
index 358d15e..85becc2 100644
--- a/win/tkWinX.c
+++ b/win/tkWinX.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: tkWinX.c,v 1.5 1999/04/16 01:51:54 stanton Exp $
+ * RCS: @(#) $Id: tkWinX.c,v 1.6 1999/07/09 02:10:07 stanton Exp $
*/
#include "tkWinInt.h"
@@ -516,7 +516,6 @@ TkWinChildProc(hwnd, message, wParam, lParam)
case WM_CREATE:
case WM_ERASEBKGND:
- case WM_WINDOWPOSCHANGED:
result = 0;
break;