Bug 129666: Xlib/Xprint do not scale em-dash & co. correctly. r=bstell@ix.netcom.com, sr=scc. Checking in for Roland.Mainz@informatik.med.uni-giessen.de

git-svn-id: svn://10.0.0.236/trunk@122232 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
smontagu%netscape.com 2002-05-28 21:40:06 +00:00
parent b3582cba8f
commit 9f91e7fbe7
2 changed files with 2 additions and 6 deletions

View File

@ -265,8 +265,6 @@ struct nsFontCharSetMapXlib
nsFontCharSetInfoXlib* mInfo;
};
typedef XFontStruct *XFontStructPtr;
/* WorkInProgress (for bug 119491 ("Cleanup global vars in PostScript and
* Xprint modules"): Container to hold per-device context data for
* fontmetrics code */
@ -292,8 +290,6 @@ public:
virtual ~nsFontXlib();
NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
operator const XFontStructPtr() { return (const XFontStructPtr)mFont; }
void LoadFont(void);
PRBool IsEmptyFont(XFontStruct*);

View File

@ -552,9 +552,9 @@ void nsRenderingContextXlib::UpdateGC()
values.foreground = color;
valuesMask |= GCForeground;
if (mCurrentFont && XFontStructPtr(*mCurrentFont)) {
if (mCurrentFont && mCurrentFont->GetXFontStruct()) {
valuesMask |= GCFont;
values.font = XFontStructPtr(*mCurrentFont)->fid;
values.font = mCurrentFont->GetXFontStruct()->fid;
}
values.line_style = mLineStyle;