diff options
| author | stanton <stanton> | 1998-10-06 03:27:35 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1998-10-06 03:27:35 (GMT) |
| commit | 9d890efca1b934394e40639915605915a51a3eb5 (patch) | |
| tree | 8ecbc06c27e49276fe6b6f3405b1bc7b910d4252 /win | |
| parent | 3c1a537631e7e5fdc7c237b92a582824afea1fda (diff) | |
| download | tk-9d890efca1b934394e40639915605915a51a3eb5.zip tk-9d890efca1b934394e40639915605915a51a3eb5.tar.gz tk-9d890efca1b934394e40639915605915a51a3eb5.tar.bz2 | |
merged 8.0.4 into 8.1
Diffstat (limited to 'win')
| -rw-r--r-- | win/makefile.vc | 9 | ||||
| -rw-r--r-- | win/rc/tk.rc | 3 | ||||
| -rw-r--r-- | win/tkWinMenu.c | 6 | ||||
| -rw-r--r-- | win/tkWinX.c | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/win/makefile.vc b/win/makefile.vc index 4dc4594..5dc1fae 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.1.4.2 1998/09/30 02:19:26 stanton Exp $ +# RCS: @(#) $Id: makefile.vc,v 1.1.4.3 1998/10/06 03:27:36 stanton Exp $ # Does not depend on the presence of any environment variables in # order to compile tcl; all needed information is derived from @@ -28,7 +28,7 @@ ROOT = .. TOOLS32 = c:\progra~1\devstudio\vc TOOLS32_rc = c:\progra~1\devstudio\sharedide -TCLDIR = ..\..\tcl8.1a2 +TCLDIR = ..\..\tcl8.1 # Set this to the appropriate value of /MACHINE: for your platform MACHINE = IX86 @@ -297,9 +297,10 @@ CON_CFLAGS = $(cdebug) $(cflags) $(cvars) $(include32) -DCONSOLE ###################################################################### all: setup $(WISH) -test: setup $(TKTEST) plugin: setup $(TKPLUGINDLL) $(WISHP) +test: setup $(TKTEST) + setup: @mkd $(TMPDIR) @mkd $(OUTDIR) @@ -389,7 +390,7 @@ $(TMPDIR)\winMain.obj: $(ROOT)\win\winMain.c $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -Fo$(TMPDIR)\ $< {$(RCDIR)}.rc{$(TMPDIR)}.res: - $(rc32) -fo $@ -r -i $(GENERICDIR) $< + $(rc32) -fo $@ -r -i $(GENERICDIR) -i $(TOOLS32)\include $< clean: -@del $(OUTDIR)\*.exp diff --git a/win/rc/tk.rc b/win/rc/tk.rc index db90945..d3da276 100644 --- a/win/rc/tk.rc +++ b/win/rc/tk.rc @@ -1,10 +1,9 @@ -// RCS: @(#) $Id: tk.rc,v 1.1.4.2 1998/09/30 02:19:42 stanton Exp $ +// RCS: @(#) $Id: tk.rc,v 1.1.4.3 1998/10/06 03:27:38 stanton Exp $ // // Version // #include <windows.h> - #define RESOURCE_INCLUDED #include <tk.h> diff --git a/win/tkWinMenu.c b/win/tkWinMenu.c index 47915ae..d92c8b7 100644 --- a/win/tkWinMenu.c +++ b/win/tkWinMenu.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinMenu.c,v 1.1.4.2 1998/09/30 02:19:35 stanton Exp $ + * RCS: @(#) $Id: tkWinMenu.c,v 1.1.4.3 1998/10/06 03:27:36 stanton Exp $ */ #define OEMRESOURCE @@ -1820,8 +1820,8 @@ MenuKeyBindProc(clientData, interp, eventPtr, tkwin, keySym) CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)), WM_SYSKEYDOWN, virtualKey, ((scanCode << 16) | (1 << 29))); - if (eventPtr->xkey.nchars > 0) { - for (i = 0; i < eventPtr->xkey.nchars; i++) { + if (eventPtr->xkey.nbytes > 0) { + for (i = 0; i < eventPtr->xkey.nbytes; i++) { CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)), WM_SYSCHAR, diff --git a/win/tkWinX.c b/win/tkWinX.c index 3ef489b..9ec1865 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -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: tkWinX.c,v 1.1.4.2 1998/09/30 02:19:40 stanton Exp $ + * RCS: @(#) $Id: tkWinX.c,v 1.1.4.3 1998/10/06 03:27:37 stanton Exp $ */ #include "tkWinInt.h" @@ -941,8 +941,8 @@ GetTranslatedKey(xkey) while ((xkey->nbytes < XMaxTransChars) && PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE)) { if ((msg.message == WM_CHAR) || (msg.message == WM_SYSCHAR)) { - xkey->trans_chars[xkey->nchars] = (char) msg.wParam; - xkey->nchars++; + xkey->trans_chars[xkey->nbytes] = (char) msg.wParam; + xkey->nbytes++; GetMessage(&msg, NULL, 0, 0); /* |