diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2010-01-02 18:40:34 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2010-01-02 18:40:34 (GMT) |
| commit | 8f3de0a30c0a7ea499c81e5e0e000d2297233137 (patch) | |
| tree | 9c2699e8843aaaaba801cb30ccd153373024c47b /unix/tkUnixRFont.c | |
| parent | 62396a6287c6c5db14a735844cf11a0b9cc9dbd3 (diff) | |
| download | tk-8f3de0a30c0a7ea499c81e5e0e000d2297233137.zip tk-8f3de0a30c0a7ea499c81e5e0e000d2297233137.tar.gz tk-8f3de0a30c0a7ea499c81e5e0e000d2297233137.tar.bz2 | |
Revert my last commit on grounds it is more likely to cause problems than not.
Diffstat (limited to 'unix/tkUnixRFont.c')
| -rw-r--r-- | unix/tkUnixRFont.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c index 081e6fd..eef42d5 100644 --- a/unix/tkUnixRFont.c +++ b/unix/tkUnixRFont.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: tkUnixRFont.c,v 1.31 2010/01/02 15:43:51 dkf Exp $ + * RCS: @(#) $Id: tkUnixRFont.c,v 1.32 2010/01/02 18:40:35 dkf Exp $ */ #include "tkUnixInt.h" @@ -286,7 +286,6 @@ InitFont( ftFont = GetFont(fontPtr, 0, 0.0); fontPtr->font.fid = XLoadFont(Tk_Display(tkwin), "fixed"); - fontPtr->font.fa.size = TkFontGetPoints(tkwin, fontPtr->font.fa.size); GetTkFontAttributes(ftFont, &fontPtr->font.fa); GetTkFontMetrics(ftFont, &fontPtr->font.fm); @@ -606,7 +605,6 @@ TkpGetFontAttrsForChar( /* Actual font used to render the character */ GetTkFontAttributes(ftFont, faPtr); - faPtr->size = TkFontGetPoints(tkwin, faPtr->size); faPtr->underline = fontPtr->font.fa.underline; faPtr->overstrike = fontPtr->font.fa.overstrike; } |