Author: kostat
Date: 2007-03-01 09:38:08 -0500 (Thu, 01 Mar 2007)
New Revision: 73590
Modified:
trunk/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs
Log:
TARGET_JVM: align with recent changes in SystemFonts
Modified: trunk/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs
===================================================================
--- trunk/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs 2007-03-01
14:23:46 UTC (rev 73589)
+++ trunk/mcs/class/System.Drawing/System.Drawing/Font.jvm.cs 2007-03-01
14:38:08 UTC (rev 73590)
@@ -19,7 +19,7 @@
private readonly byte _charset;
#if NET_2_0
- private string systemFontName;
+ private readonly string _systemFontName;
#endif
#endregion
@@ -122,6 +122,13 @@
: this (GetFontFamily (familyName), emSize, style,
unit, charSet, isVertical) {
}
+#if NET_2_0
+ internal Font (string familyName, float emSize, string
systemName)
+ : this (familyName, emSize) {
+ _systemFontName = systemName;
+ }
+#endif
+
static FontFamily GetFontFamily (string familyName) {
#if ONLY_1_1
if (familyName == null)
@@ -271,25 +278,16 @@
[Browsable (false)]
public bool IsSystemFont {
get {
- if (systemFontName == null)
- return false;
-
- return StringComparer.InvariantCulture.Compare
(systemFontName, string.Empty) != 0;
+ return !string.IsNullOrEmpty (_systemFontName);
}
}
[Browsable (false)]
public string SystemFontName {
get {
- return systemFontName;
+ return _systemFontName;
}
}
-
- internal string SysFontName {
- set {
- systemFontName = value;
- }
- }
#endif
#endregion
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
