Merge branch 'master' of github.com:mono/mono into masterwork

[mono.git] / mcs / class / System.Drawing / System.Drawing / FontFamily.jvm.cs

diff --git a/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs b/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs
index 7f45435f272ca381f648a261995862dadcb70c5d..900427437620cf1e153b8040883092e6e678f473 100644 (file)
--- 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