diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | tests/unixSelect.test | 10 | ||||
| -rw-r--r-- | win/makefile.vc | 5 | ||||
| -rw-r--r-- | win/tkWinX.c | 3 |
4 files changed, 25 insertions, 5 deletions
@@ -1,3 +1,15 @@ +1999-07-08 <stanton@scriptics.com> + + * 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. + 1999-07-08 <redman@scriptics.com> * unix/configure.in: Fix Tk stub lib file names and flags. diff --git a/tests/unixSelect.test b/tests/unixSelect.test index 4cc0921..c5ea280 100644 --- a/tests/unixSelect.test +++ b/tests/unixSelect.test @@ -9,7 +9,7 @@ # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: unixSelect.test,v 1.1 1999/06/03 18:50:46 stanton Exp $ +# RCS: @(#) $Id: unixSelect.test,v 1.2 1999/07/09 02:10:07 stanton Exp $ if {[lsearch [namespace children] ::tcltest] == -1} { source [file join [pwd] [file dirname [info script]] defs.tcl] @@ -155,6 +155,12 @@ test unixSelect-1.4 {TkSelGetSelection procedure: simple i18n text, iso2022} {un lappend result $selInfo } {1 2 4 {COMPOUND_TEXT 0 4000}} test unixSelect-1.5 {TkSelGetSelection procedure: INCR i18n text, iso2022} {unixOnly} { + + # This test is subtle. The selection ends up getting fetched twice by + # Tk: once to compute the length, and again to actually send the data. + # The first time through, we don't convert the data to ISO2022, so the + # buffer boundaries end up being different in the two passes. + setupbg setup selection handle -type COMPOUND_TEXT -format COMPOUND_TEXT . \ @@ -170,7 +176,7 @@ test unixSelect-1.5 {TkSelGetSelection procedure: INCR i18n text, iso2022} {unix }] cleanupbg lappend result $selInfo -} {1 8000 8002 {COMPOUND_TEXT 0 4000 COMPOUND_TEXT 0 4000 COMPOUND_TEXT 4000 3998 COMPOUND_TEXT 7997 4000}} +} {1 8000 8002 {COMPOUND_TEXT 0 4000 COMPOUND_TEXT 4000 3999 COMPOUND_TEXT 7998 4000 COMPOUND_TEXT 0 4000 COMPOUND_TEXT 4000 3998 COMPOUND_TEXT 7997 4000}} test unixSelect-1.6 {TkSelGetSelection procedure: simple i18n text, iso2022} {unixOnly} { setupbg setup 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; |