summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstanton <stanton>1998-11-25 23:06:42 (GMT)
committerstanton <stanton>1998-11-25 23:06:42 (GMT)
commitb40ea56cfb2caa157a3364cff0764f5dcefd3283 (patch)
tree79a32c17933e47a32918a7dd6cfbc08b4eb70a4b
parent5707d96ad3b89a0bf107b2a783e793571c561886 (diff)
downloadtk-b40ea56cfb2caa157a3364cff0764f5dcefd3283.zip
tk-b40ea56cfb2caa157a3364cff0764f5dcefd3283.tar.gz
tk-b40ea56cfb2caa157a3364cff0764f5dcefd3283.tar.bz2
* generic/tkFont.c (TkFontParseXLFD): initialize charset to
iso8859-1 if no charset is specified.
-rw-r--r--generic/tkFont.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c
index 6340c76..f923209 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.1.4.4 1998/11/25 21:16:31 stanton Exp $
+ * RCS: @(#) $Id: tkFont.c,v 1.1.4.5 1998/11/25 23:06:42 stanton Exp $
*/
#include "tkPort.h"
@@ -3351,6 +3351,8 @@ TkFontParseXLFD(string, faPtr, xaPtr)
if (FieldSpecified(field[XLFD_CHARSET])) {
xaPtr->charset = Tk_GetUid(field[XLFD_CHARSET]);
+ } else {
+ xaPtr->charset = Tk_GetUid("iso8859-1");
}
Tcl_DStringFree(&ds);
return TCL_OK;