From 3307394dbaf40763ae9470dba2ea410f65d90bb0 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Wed, 14 Jun 2017 18:20:07 +0200 Subject: [PATCH] Use CoreFX sources for System.Drawing.Text (#5036) --- .../GenericFontFamilies.cs | 36 ---------------- .../System.Drawing.Text/HotkeyPrefix.cs | 36 ---------------- .../System.Drawing.Text/TextRenderingHint.cs | 39 ----------------- .../System.Drawing/System.Drawing.dll.sources | 18 ++++---- .../System.Drawing/FontStyle.cs | 39 ----------------- .../System.Drawing/StringAligment.cs | 36 ---------------- .../System.Drawing/StringDigitSubstitute.cs | 37 ---------------- .../System.Drawing/StringFormatFlags.cs | 43 ------------------- .../System.Drawing/StringTrimming.cs | 39 ----------------- .../System.Drawing/StringUnit.cs | 41 ------------------ 10 files changed, 9 insertions(+), 355 deletions(-) delete mode 100644 mcs/class/System.Drawing/System.Drawing.Text/GenericFontFamilies.cs delete mode 100644 mcs/class/System.Drawing/System.Drawing.Text/HotkeyPrefix.cs delete mode 100644 mcs/class/System.Drawing/System.Drawing.Text/TextRenderingHint.cs delete mode 100644 mcs/class/System.Drawing/System.Drawing/FontStyle.cs delete mode 100644 mcs/class/System.Drawing/System.Drawing/StringAligment.cs delete mode 100644 mcs/class/System.Drawing/System.Drawing/StringDigitSubstitute.cs delete mode 100644 mcs/class/System.Drawing/System.Drawing/StringFormatFlags.cs delete mode 100644 mcs/class/System.Drawing/System.Drawing/StringTrimming.cs delete mode 100644 mcs/class/System.Drawing/System.Drawing/StringUnit.cs diff --git a/mcs/class/System.Drawing/System.Drawing.Text/GenericFontFamilies.cs b/mcs/class/System.Drawing/System.Drawing.Text/GenericFontFamilies.cs deleted file mode 100644 index 44230976050..00000000000 --- a/mcs/class/System.Drawing/System.Drawing.Text/GenericFontFamilies.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -// System.Drawing.GenericFontFamilies.cs -// -// Author: Dennis Hayes (dennish@raytek.com) -// -// (C) 2002 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -namespace System.Drawing.Text { - - public enum GenericFontFamilies { - Monospace = 2, - SansSerif = 1, - Serif = 0 - } -} diff --git a/mcs/class/System.Drawing/System.Drawing.Text/HotkeyPrefix.cs b/mcs/class/System.Drawing/System.Drawing.Text/HotkeyPrefix.cs deleted file mode 100644 index 19a7cbe6e50..00000000000 --- a/mcs/class/System.Drawing/System.Drawing.Text/HotkeyPrefix.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -// System.Drawing.HotkeyPrefix.cs -// -// Author: Dennis Hayes (dennish@raytek.com) -// -// (C) 2002 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -namespace System.Drawing.Text { - - public enum HotkeyPrefix { - Hide = 2, - None = 0, - Show = 1 - } -} diff --git a/mcs/class/System.Drawing/System.Drawing.Text/TextRenderingHint.cs b/mcs/class/System.Drawing/System.Drawing.Text/TextRenderingHint.cs deleted file mode 100644 index 02af56cb837..00000000000 --- a/mcs/class/System.Drawing/System.Drawing.Text/TextRenderingHint.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -// System.Drawing.TextRenderingHint.cs -// -// Author: Dennis Hayes (dennish@raytek.com) -// -// (C) 2002 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -namespace System.Drawing.Text { - - public enum TextRenderingHint { - AntiAlias = 4, - AntiAliasGridFit = 3, - ClearTypeGridFit = 5, - SingleBitPerPixel = 2, - SingleBitPerPixelGridFit = 1, - SystemDefault = 0 - } -} diff --git a/mcs/class/System.Drawing/System.Drawing.dll.sources b/mcs/class/System.Drawing/System.Drawing.dll.sources index eb368a4ba26..398431a7cb4 100755 --- a/mcs/class/System.Drawing/System.Drawing.dll.sources +++ b/mcs/class/System.Drawing/System.Drawing.dll.sources @@ -21,7 +21,7 @@ System.Drawing/CopyPixelOperation.cs System.Drawing/Font.cs System.Drawing/FontConverter.cs System.Drawing/FontFamily.cs -System.Drawing/FontStyle.cs +../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/FontStyle.cs System.Drawing/Graphics.cs System.Drawing/GraphicsUnit.cs System.Drawing/gdipEnums.cs @@ -52,12 +52,12 @@ System.Drawing/SizeF.cs System.Drawing/SizeFConverter.cs System.Drawing/SolidBrush.cs System.Drawing/SRDescriptionAttribute.cs -System.Drawing/StringAligment.cs -System.Drawing/StringDigitSubstitute.cs +../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/StringAlignment.cs +../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/StringDigitSubstitute.cs System.Drawing/StringFormat.cs -System.Drawing/StringFormatFlags.cs -System.Drawing/StringTrimming.cs -System.Drawing/StringUnit.cs +../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/StringFormatFlags.cs +../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/StringTrimming.cs +../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/StringUnit.cs System.Drawing/SystemBrushes.cs System.Drawing/SystemColors.cs System.Drawing/SystemFonts.cs @@ -190,8 +190,8 @@ System.Drawing.Printing/PrintRange.cs System.Drawing.Printing/StandardPrintController.cs System.Drawing.Text/FontCollection.cs System.Drawing.Text/PrivateFontCollection.cs -System.Drawing.Text/GenericFontFamilies.cs -System.Drawing.Text/HotkeyPrefix.cs +../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Text/GenericFontFamilies.cs +../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Text/HotkeyPrefix.cs System.Drawing.Text/InstalledFontCollection.cs -System.Drawing.Text/TextRenderingHint.cs +../../../external/corefx/src/System.Drawing.Common/src/System/Drawing/Text/TextRenderingHint.cs diff --git a/mcs/class/System.Drawing/System.Drawing/FontStyle.cs b/mcs/class/System.Drawing/System.Drawing/FontStyle.cs deleted file mode 100644 index 8c5f9c7e953..00000000000 --- a/mcs/class/System.Drawing/System.Drawing/FontStyle.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -// System.Drawing.FontStyle.cs -// -// Author: Dennis Hayes (dennish@raytek.com) -// -// (C) 2001 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -namespace System.Drawing { - - [Flags] - public enum FontStyle { - Regular = 0, - Bold = 1, - Italic = 2, - Underline = 4, - Strikeout = 8 - } -} diff --git a/mcs/class/System.Drawing/System.Drawing/StringAligment.cs b/mcs/class/System.Drawing/System.Drawing/StringAligment.cs deleted file mode 100644 index 6b2080c522e..00000000000 --- a/mcs/class/System.Drawing/System.Drawing/StringAligment.cs +++ /dev/null @@ -1,36 +0,0 @@ -// -// System.Drawing.StringAligment.cs -// -// Author: Dennis Hayes (dennish@raytek.com) -// -// (C) 2001 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -namespace System.Drawing { - - public enum StringAlignment { - Near = 0, - Center = 1, - Far = 2 - } -} diff --git a/mcs/class/System.Drawing/System.Drawing/StringDigitSubstitute.cs b/mcs/class/System.Drawing/System.Drawing/StringDigitSubstitute.cs deleted file mode 100644 index ab15c27548b..00000000000 --- a/mcs/class/System.Drawing/System.Drawing/StringDigitSubstitute.cs +++ /dev/null @@ -1,37 +0,0 @@ -// -// System.Drawing.StringDigitSubstitute.cs -// -// Author: Dennis Hayes (dennish@raytek.com) -// -// (C) 2001 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -namespace System.Drawing { - - public enum StringDigitSubstitute { - User = 0, - None = 1, - National = 2, - Traditional = 3 - } -} diff --git a/mcs/class/System.Drawing/System.Drawing/StringFormatFlags.cs b/mcs/class/System.Drawing/System.Drawing/StringFormatFlags.cs deleted file mode 100644 index 7b025a279d5..00000000000 --- a/mcs/class/System.Drawing/System.Drawing/StringFormatFlags.cs +++ /dev/null @@ -1,43 +0,0 @@ -// -// System.Drawing.StringFormatFlags.cs -// -// Author: Dennis Hayes (dennish@raytek.com) -// -// (C) 2001 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -namespace System.Drawing { - - [Flags] - public enum StringFormatFlags { - DirectionRightToLeft = 0x0001, - DirectionVertical = 0x0002, - FitBlackBox = 0x0004, - DisplayFormatControl = 0x0020, - NoFontFallback = 0x0400, - MeasureTrailingSpaces = 0x0800, - NoWrap = 0x1000, - LineLimit = 0x2000, - NoClip = 0x4000 - } -} diff --git a/mcs/class/System.Drawing/System.Drawing/StringTrimming.cs b/mcs/class/System.Drawing/System.Drawing/StringTrimming.cs deleted file mode 100644 index 0b76d7221aa..00000000000 --- a/mcs/class/System.Drawing/System.Drawing/StringTrimming.cs +++ /dev/null @@ -1,39 +0,0 @@ -// -// System.Drawing.StringTrimming.cs -// -// Author: Dennis Hayes (dennish@raytek.com) -// -// (C) 2001 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -namespace System.Drawing { - - public enum StringTrimming { - None = 0, - Character = 1, - Word = 2, - EllipsisCharacter = 3, - EllipsisWord = 4, - EllipsisPath = 5 - } -} diff --git a/mcs/class/System.Drawing/System.Drawing/StringUnit.cs b/mcs/class/System.Drawing/System.Drawing/StringUnit.cs deleted file mode 100644 index c9bbf984a40..00000000000 --- a/mcs/class/System.Drawing/System.Drawing/StringUnit.cs +++ /dev/null @@ -1,41 +0,0 @@ -// -// System.Drawing.StringUnit.cs -// -// Author: Dennis Hayes (dennish@raytek.com) -// -// (C) 2001 Ximian, Inc. http://www.ximian.com -// Copyright (C) 2004,2006 Novell, Inc (http://www.novell.com) -// -// Permission is hereby granted, free of charge, to any person obtaining -// a copy of this software and associated documentation files (the -// "Software"), to deal in the Software without restriction, including -// without limitation the rights to use, copy, modify, merge, publish, -// distribute, sublicense, and/or sell copies of the Software, and to -// permit persons to whom the Software is furnished to do so, subject to -// the following conditions: -// -// The above copyright notice and this permission notice shall be -// included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -// - -namespace System.Drawing { - - public enum StringUnit{ - World = 0x00, - Display = 0x01, - Pixel = 0x02, - Point = 0x03, - Inch = 0x04, - Document = 0x05, - Millimeter = 0x06, - Em = 0x20 - } -} -- 2.25.1