Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Triger <kostat@mono-cvs.ximian.com>2005-11-13 14:19:05 +0300
committerKonstantin Triger <kostat@mono-cvs.ximian.com>2005-11-13 14:19:05 +0300
commit8a727b19357a3e36052f6ef2f059a3ed6a320372 (patch)
tree4b7ae8c04f7675b6f14167f691cf2378757ad494 /mcs/class/System.Drawing
parent912cee669c735329c34a6509a437389ee01af313 (diff)
initialize fontcollection
svn path=/trunk/mcs/; revision=52964
Diffstat (limited to 'mcs/class/System.Drawing')
-rw-r--r--mcs/class/System.Drawing/System.Drawing/ChangeLog4
-rw-r--r--mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs5
2 files changed, 9 insertions, 0 deletions
diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog
index 7fb06aa90c4..1318bfde438 100644
--- a/mcs/class/System.Drawing/System.Drawing/ChangeLog
+++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog
@@ -1,5 +1,9 @@
2005-11-13 Konstantin Triger <kostat@mainsoft.com>
+ * FontFamily.jvm.cs: correctly initialize fontcollection
+
+2005-11-13 Konstantin Triger <kostat@mainsoft.com>
+
* FontFamily.jvm.cs: DrawMargin, refactoring.
2005-11-13 Konstantin Triger <kostat@mainsoft.com>
diff --git a/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs b/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs
index 92b16d62e8f..d5a799fee2b 100644
--- a/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs
+++ b/mcs/class/System.Drawing/System.Drawing/FontFamily.jvm.cs
@@ -98,6 +98,8 @@ namespace System.Drawing {
_name = _genericMonospace._name;
break;
}
+
+ _fontCollection = _installedFonts;
}
#endregion
@@ -138,6 +140,9 @@ namespace System.Drawing {
}
public string GetName(int language) {
+ if (language == 0)
+ return Name;
+
CultureInfo culture = new CultureInfo(language, false);
java.util.Locale locale = vmw.@internal.EnvironmentUtils.getLocaleFromCultureInfo( culture );