diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2010-01-02 18:41:14 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2010-01-02 18:41:14 (GMT) |
| commit | d87d27dacd4c8e09f7ee26c45ea2ac9219068626 (patch) | |
| tree | 5457f2da362e25796acda22a10d1e1f80b4cfd7a | |
| parent | 949e4994e6117d060976e5f1492af6c731e5044c (diff) | |
| download | tk-d87d27dacd4c8e09f7ee26c45ea2ac9219068626.zip tk-d87d27dacd4c8e09f7ee26c45ea2ac9219068626.tar.gz tk-d87d27dacd4c8e09f7ee26c45ea2ac9219068626.tar.bz2 | |
Revert my last commit on grounds it is more likely to cause problems than not.
| -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 bc3d40a..29ef7fb 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.24.2.3 2010/01/02 15:41:04 dkf Exp $ + * RCS: @(#) $Id: tkUnixRFont.c,v 1.24.2.4 2010/01/02 18:41:14 dkf Exp $ */ #include "tkUnixInt.h" @@ -257,7 +257,6 @@ InitFont( */ ftFont = GetFont(fontPtr, 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); @@ -571,7 +570,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; } |