diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | unix/tkUnixRFont.c | 4 |
2 files changed, 1 insertions, 8 deletions
@@ -1,10 +1,5 @@ 2010-01-02 Donal K. Fellows <dkf@users.sf.net> - * unix/tkUnixRFont.c (InitFont, TkpGetFontAttrsForChar): Apply some - patches already in use on Ubuntu. Makes the font size always report as - being in points, which is necessary for getting postscript generation - right. - * unix/tkUnixEvent.c (TransferXEventsToTcl): [Bug 1924761]: Use the new cache mechanism to force the extraction of the string of a key event from XIM at the right time rather than after queueing when it 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; } |