diff options
| author | das <das@noemail.net> | 2009-06-29 14:35:01 (GMT) |
|---|---|---|
| committer | das <das@noemail.net> | 2009-06-29 14:35:01 (GMT) |
| commit | a6401db9ac290e17faaf7897ec75bf07ef5b743f (patch) | |
| tree | 81b5743d2ff5d45f2ee4992153e4f34949ea8f8a /generic/tkSelect.c | |
| parent | 26cb1dfcf18ed78319ed485346885111ef5c34ed (diff) | |
| download | tk-a6401db9ac290e17faaf7897ec75bf07ef5b743f.zip tk-a6401db9ac290e17faaf7897ec75bf07ef5b743f.tar.gz tk-a6401db9ac290e17faaf7897ec75bf07ef5b743f.tar.bz2 | |
Merge of TkAqua Cocoa portmacosx-cocoa-merge
FossilOrigin-Name: 05bd0a2cb86bb730d85069b3282e569b6c23d911
Diffstat (limited to 'generic/tkSelect.c')
| -rw-r--r-- | generic/tkSelect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkSelect.c b/generic/tkSelect.c index 9a13e9a..da44ab8 100644 --- a/generic/tkSelect.c +++ b/generic/tkSelect.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: tkSelect.c,v 1.28 2009/02/03 23:55:47 nijtmans Exp $ + * RCS: @(#) $Id: tkSelect.c,v 1.29 2009/06/29 14:35:01 das Exp $ */ #include "tkInt.h" @@ -1193,7 +1193,7 @@ TkSelInit( * http://www.cl.cam.ac.uk/~mgk25/unicode.html#x11 */ -#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) +#if !defined(__WIN32__) dispPtr->utf8Atom = Tk_InternAtom(tkwin, "UTF8_STRING"); #else dispPtr->utf8Atom = (Atom) NULL; |