X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Drawing%2FSystem.Drawing%2FFontFamily.jvm.cs;h=900427437620cf1e153b8040883092e6e678f473;hb=455b2f894a2cc899fa469ac6fbe66dca163761b1;hp=7f45435f272ca381f648a261995862dadcb70c5d;hpb=b9562cbeddb22e502749c455cb1bd5ecc8e12d5d;p=mono.git diff --git a/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs b/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs index 7f45435f272..90042743762 100644 --- a/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs +++ b/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs @@ -44,9 +44,10 @@ namespace System.Drawing { static readonly FontFamily _genericSansSerif; static readonly FontFamily _genericSerif; static readonly FontCollection _installedFonts; - static readonly awt.Container _container = new awt.Container(); + internal static readonly awt.Container Container; static FontFamily() { + Container = new awt.Container(); _installedFonts = new InstalledFontCollection(); _genericMonospace = new FontFamily(GenericFontFamilies.Monospace); _genericSansSerif = new FontFamily(GenericFontFamilies.SansSerif); @@ -120,7 +121,7 @@ namespace System.Drawing { if ((_lastStyle != style) || (_fontMetrics == null)) { java.util.Map attrib = Font.DeriveStyle( FamilyFont.getAttributes(), style, true); attrib.put(TextAttribute.SIZE, new java.lang.Float((float)(UnitsPerEm<<1))); - _fontMetrics = _container.getFontMetrics( FamilyFont.deriveFont( attrib ) ); + _fontMetrics = Container.getFontMetrics( FamilyFont.deriveFont( attrib ) ); } return _fontMetrics; } @@ -218,7 +219,6 @@ namespace System.Drawing { #region IDisposable Members public void Dispose() { - // TODO: Add FontFamily.Dispose implementation } #endregion