Merge pull request #461 from knocte/xbuild_improvements

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

diff --git a/mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs b/mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs
index b63870a1bcb70dd85f5d4eb51783860b67069c8b..3d9ec7944ff6acc5f58f42ac59303b42cc0a84e0 100644 (file)
--- a/mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs
+++ b/mcs/class/System.Drawing/System.Drawing/StringFormat.jvm.cs
@@ -50,6 +50,8 @@ namespace System.Drawing {
                
                private float _firstTabOffset;
                private float [] _tabStops;
+
+               private bool _genericTypeographic = false;
                
                #region Constructors
 
@@ -178,6 +180,7 @@ namespace System.Drawing {
                                        StringFormatFlags.NoClip, 
                                        0 );
                                genericTypographic.Trimming = StringTrimming.None;
+                               genericTypographic._genericTypeographic = true;
                                return genericTypographic;
                        }
                }
@@ -185,40 +188,40 @@ namespace System.Drawing {
                #endregion
 
                #region internal accessors
-               internal bool NoWrap {\r
-                       get {\r
-                               return (FormatFlags & StringFormatFlags.NoWrap) != 0;\r
-                       }\r
-               }\r
-\r
-               internal bool IsVertical {\r
-                       get {\r
-                               return (FormatFlags & StringFormatFlags.DirectionVertical) != 0;\r
-                       }\r
-               }\r
-\r
-               internal bool MeasureTrailingSpaces {\r
-                       get {\r
-                               return (FormatFlags & StringFormatFlags.MeasureTrailingSpaces) != 0;\r
-                       }\r
-               }\r
-\r
-               internal bool LineLimit {\r
-                       get {\r
-                               return (FormatFlags & StringFormatFlags.LineLimit) != 0;\r
-                       }\r
-               }\r
-\r
-               internal bool NoClip {\r
-                       get {\r
-                               return (FormatFlags & StringFormatFlags.NoClip) != 0;\r
-                       }\r
+               internal bool NoWrap {
+                       get {
+                               return (FormatFlags & StringFormatFlags.NoWrap) != 0;
+                       }
+               }
+
+               internal bool IsVertical {
+                       get {
+                               return (FormatFlags & StringFormatFlags.DirectionVertical) != 0;
+                       }
                }
 
-               internal bool IsRightToLeft {\r
-                       get {\r
-                               return (FormatFlags & StringFormatFlags.DirectionRightToLeft) != 0;\r
-                       }\r
+               internal bool MeasureTrailingSpaces {
+                       get {
+                               return (FormatFlags & StringFormatFlags.MeasureTrailingSpaces) != 0;
+                       }
+               }
+
+               internal bool LineLimit {
+                       get {
+                               return (FormatFlags & StringFormatFlags.LineLimit) != 0;
+                       }
+               }
+
+               internal bool NoClip {
+                       get {
+                               return (FormatFlags & StringFormatFlags.NoClip) != 0;
+                       }
+               }
+
+               internal bool IsRightToLeft {
+                       get {
+                               return (FormatFlags & StringFormatFlags.DirectionRightToLeft) != 0;
+                       }
                }
                
                internal CharacterRange [] CharRanges {
@@ -226,6 +229,13 @@ namespace System.Drawing {
                                return _charRanges;
                        }
                }
+
+               internal bool IsGenericTypographic
+               {
+                       get {
+                               return _genericTypeographic;
+                       }
+               }
                #endregion
 
                #region public methods
@@ -250,13 +260,13 @@ namespace System.Drawing {
                public void SetTabStops(float firstTabOffset, float[] tabStops) {
 //                     _firstTabOffset = firstTabOffset;
 //                     _tabStops = tabStops != null ? (float[])tabStops.Clone() : null;
-                       throw new NotSupportedException();
+                       throw new NotImplementedException();
                }
 
                public void SetDigitSubstitution(int language,  StringDigitSubstitute substitute) {
 //                     _digitSubstituteMethod = substitute;
 //                     _digitSubstituteLanguage = language;
-                       throw new NotSupportedException();
+                       throw new NotImplementedException();
                }
 
                [MonoTODO]