summaryrefslogtreecommitdiffstats
path: root/generic/tkFont.c
diff options
context:
space:
mode:
authorhobbs <hobbs>1999-12-16 21:57:35 (GMT)
committerhobbs <hobbs>1999-12-16 21:57:35 (GMT)
commitd3ed5663cab03782de9a8c9459ebdf859ca8bbe5 (patch)
treea359295061e8e63458411176f65e6bc6517f9dec /generic/tkFont.c
parent806f3e8e5f86a8eec2a7b052e173b98fc6ecf928 (diff)
downloadtk-d3ed5663cab03782de9a8c9459ebdf859ca8bbe5.zip
tk-d3ed5663cab03782de9a8c9459ebdf859ca8bbe5.tar.gz
tk-d3ed5663cab03782de9a8c9459ebdf859ca8bbe5.tar.bz2
* generic/tkCmds.c:
* generic/tkEvent.c: * generic/tkWindow.c: * generic/tkInt.h: add 'tk useinputmethods ?-display win? ?bool?' call to provide support for disabling/enabling the use of XIM on X. This was previously all done at compile time, and always on. Now it * generic/tkCanvUtil.c: fixed bug in Tk_CanvasPsOutline that freed mem it shouldn't. * generic/tkFont.c: added "bitstream cyberbit" (popular Windows CJK font) to list of font fallbacks. (kenny) [Bug: 2407]
Diffstat (limited to 'generic/tkFont.c')
-rw-r--r--generic/tkFont.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c
index 8fdbcc9..59e8a7f 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -11,7 +11,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkFont.c,v 1.7 1999/12/14 06:52:28 hobbs Exp $
+ * RCS: @(#) $Id: tkFont.c,v 1.8 1999/12/16 21:57:36 hobbs Exp $
*/
#include "tkPort.h"
@@ -310,6 +310,7 @@ static char *globalFontClass[] = {
"symbol", /* All platforms. */
/* Unix. */
"lucida sans unicode", /* Windows. */
+ "bitstream cyberbit", /* Windows popular CJK font */
"chicago", /* Mac. */
NULL
};