diff options
| author | wolfsuit <wolfsuit> | 2002-02-05 02:25:13 (GMT) |
|---|---|---|
| committer | wolfsuit <wolfsuit> | 2002-02-05 02:25:13 (GMT) |
| commit | bcdb604e358027dd76ac168778b14546a8019d8a (patch) | |
| tree | 32f54ef11288f0dd53eb468b143ef224897cdefc /mac/tkMacKeyboard.c | |
| parent | efc846c18b6df17d9dfd3b527214ec413d5f175f (diff) | |
| download | tk-bcdb604e358027dd76ac168778b14546a8019d8a.zip tk-bcdb604e358027dd76ac168778b14546a8019d8a.tar.gz tk-bcdb604e358027dd76ac168778b14546a8019d8a.tar.bz2 | |
Merge with current TOT
Added support for the wm stackorder command
Fixed crash when selecting Menu items in the Application menu that we didn't
put there.
Added first bits of the use of CG for low-level drawing. The line-drawing works,
the rest doesn't yet. You have to set the file static useCGDrawing to 1 and
rebuild to activate this code.
Diffstat (limited to 'mac/tkMacKeyboard.c')
| -rw-r--r-- | mac/tkMacKeyboard.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mac/tkMacKeyboard.c b/mac/tkMacKeyboard.c index 9039625..8c1bcc7 100644 --- a/mac/tkMacKeyboard.c +++ b/mac/tkMacKeyboard.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: tkMacKeyboard.c,v 1.6 2000/04/17 02:16:58 jingham Exp $ + * RCS: @(#) $Id: tkMacKeyboard.c,v 1.6.8.1 2002/02/05 02:25:16 wolfsuit Exp $ */ #include "tkInt.h" @@ -247,7 +247,8 @@ TkpGetString( len = 0; } } - return Tcl_ExternalToUtfDString(NULL, string, len, dsPtr); + Tcl_ExternalToUtfDString(NULL, string, len, dsPtr); + return Tcl_DStringValue(dsPtr); } /* |