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:
parent
b3582cba8f
commit
9f91e7fbe7
@ -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*);
|
||||
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user