Revert "Address review feedback."

This reverts commit e244aa1.

Author: KlausLoeffelmann

src/System.Windows.Forms/System/Windows/Forms/Application.cs

@@ -22,12 +22,12 @@ namespace System.Windows.Forms;
 public sealed partial class Application
 {
     /// <summary>
-    ///  Hash table for our event list.
+    ///  Hash table for our event list
     /// </summary>
     private static EventHandlerList? s_eventHandlers;
     private static Font? s_defaultFont;
     /// <summary>
-    ///  Scaled version of non-system <see cref="s_defaultFont"/>.
+    ///  Scaled version of non system <see cref="s_defaultFont"/>.
     /// </summary>
     private static Font? s_defaultFontScaled;
     private static string? s_startupPath;
@@ -53,7 +53,7 @@ public sealed partial class Application
     private const int SystemDarkModeDisabled = 1;
 
     /// <summary>
-    ///  Events the user can hook into.
+    ///  Events the user can hook into
     /// </summary>
     private static readonly object s_eventApplicationExit = new();
     private static readonly object s_eventThreadExit = new();
@@ -68,16 +68,16 @@ public sealed partial class Application
     private static bool s_parkingWindowCreated;
 
     /// <summary>
-    ///  This class is static; there is no need to ever create it.
+    ///  This class is static, there is no need to ever create it.
     /// </summary>
     private Application()
     {
     }
 
     /// <summary>
     ///  Determines if the caller should be allowed to quit the application. This will return false,
-    ///  for example, if being called from a Windows Forms control being hosted within a web browser. The
-    ///  Windows Forms control should not attempt to quit the application.
+    ///  for example, if being called from a windows forms control being hosted within a web browser. The
+    ///  windows forms control should not attempt to quit the application.
     /// </summary>
     public static bool AllowQuit => ThreadContext.GetAllowQuit();
 
@@ -276,7 +276,7 @@ internal static bool CustomThreadExceptionHandlerAttached
     ///  </para>
     ///  <para>
     ///   Note that the dark color mode is only available from Windows 11 on or later versions. If the system
-    ///   is set to a accessibility contrast theme, the dark mode is not available.
+    ///   is set to a high contrast mode, the dark mode is not available.
     ///  </para>
     ///  <para>
     ///   <b>Note for Visual Basic:</b> If you are using the Visual Basic Application Framework, you should set the
@@ -352,15 +352,14 @@ static void NotifySystemEventsOfColorChange()
     /// <remarks>
     ///  <para>
     ///   The color setting is determined based on the operating system version and its system settings.
-    ///   It returns <see cref="SystemColorMode.Dark"/> if dark mode is enabled in the system settings,
-    ///   or <see cref="SystemColorMode.Classic"/> if the color mode is set to the light, standard color setting.
+    ///   It returns <see cref="SystemColorMode.Dark"/> if the dark mode is enabled in the system settings,
+    ///   <see cref="SystemColorMode.Classic"/> if the color mode equals the light, standard color setting.
     ///  </para>
     ///  <para>
-    ///   <see cref="SystemColorMode"/> is supported on Windows 11 or later versions.
+    ///   SystemColorMode is supported on Windows 11 or later versions.
     ///  </para>
     ///  <para>
-    ///   <see cref="SystemColorMode"/> is not supported if a Windows OS high contrast theme has been
-    ///   enabled in the system settings.
+    ///   SystemColorModes is not supported, if the Windows OS <c>High Contrast Mode</c> has been enabled in the system settings.
     ///  </para>
     /// </remarks>
     [Experimental(DiagnosticIDs.ExperimentalDarkMode, UrlFormat = DiagnosticIDs.UrlFormat)]
@@ -399,7 +398,7 @@ private static int GetSystemColorModeInternal()
 
     /// <summary>
     ///  Gets a value indicating whether the application is running in a dark system color context.
-    ///  Note: With a accessibility contrast theme selected in the OS, this will always return <see langword="false"/>.
+    ///  Note: In a high contrast mode, this will always return <see langword="false"/>.
     /// </summary>
     [Experimental(DiagnosticIDs.ExperimentalDarkMode, UrlFormat = DiagnosticIDs.UrlFormat)]
     public static bool IsDarkModeEnabled =>
@@ -915,7 +914,7 @@ internal static void DoEventsModal()
 
     /// <summary>
     ///  Enables visual styles for all subsequent <see cref="Run()"/> and <see cref="Control.CreateHandle"/> calls.
-    ///  Uses the default theming manifest file shipped with the redistributable package.
+    ///  Uses the default theming manifest file shipped with the redist.
     /// </summary>
     [UnconditionalSuppressMessage("SingleFile", "IL3002", Justification = "Single-file case is handled")]
     public static void EnableVisualStyles()
@@ -1329,10 +1328,6 @@ internal static void RunDialog(Form form)
     ///  This switch determines the default text rendering engine to use by some controls that support
     ///  switching rendering engine.
     /// </summary>
-    /// <param name="defaultValue">The default value to use for compatible text rendering.</param>
-    /// <exception cref="InvalidOperationException">
-    ///  Thrown if any window handle has already been created in the application.
-    /// </exception>
     public static void SetCompatibleTextRenderingDefault(bool defaultValue)
     {
         if (NativeWindow.AnyHandleCreated)
@@ -1344,7 +1339,7 @@ public static void SetCompatibleTextRenderingDefault(bool defaultValue)
     }
 
     /// <summary>
-    ///  Sets the default <see cref="Font"/> for the process.
+    ///  Sets the default <see cref="Font"/> for process.
     /// </summary>
     /// <param name="font">The font to be used as a default across the application.</param>
     /// <exception cref="ArgumentNullException"><paramref name="font"/> is <see langword="null"/>.</exception>
@@ -1353,11 +1348,11 @@ public static void SetCompatibleTextRenderingDefault(bool defaultValue)
     /// </exception>
     /// <remarks>
     ///  <para>
-    ///   The system text scale factor will be applied to the font. For example, if the default font is set to "Calibri, 11f"
-    ///   and the text scale factor is set to 150%, the resulting default font will be set to "Calibri, 16.5f".
+    ///   The system text scale factor will be applied to the font, i.e. if the default font is set to "Calibri, 11f"
+    ///   and the text scale factor is set to 150% the resulting default font will be set to "Calibri, 16.5f".
     ///  </para>
     ///  <para>
-    ///   Users can adjust text scale with the "Make text bigger" slider on the Settings → Accessibility → Display screen.
+    ///   Users can adjust text scale with the Make text bigger slider on the Settings -> Ease of Access -> Vision/Display screen.
     ///  </para>
     /// </remarks>
     /// <seealso href="https://docs.microsoft.com/windows/uwp/design/input/text-scaling">Windows Text scaling</seealso>
@@ -1373,7 +1368,7 @@ public static void SetDefaultFont(Font font)
     }
 
     /// <summary>
-    ///  Scales <see cref="s_defaultFont"/> or <see cref="s_defaultFontScaled"/> if needed.
+    ///  Scale <see cref="s_defaultFont"/> or <see cref="s_defaultFontScaled"/> if needed.
     /// </summary>
     internal static void ScaleDefaultFont()
     {

src/System.Windows.Forms/System/Windows/Forms/Controls/Buttons/ButtonInternal/RadioButtonBaseAdapter.cs

@@ -62,13 +62,13 @@ protected void DrawCheckBackgroundFlat(PaintEventArgs e, Rectangle bounds, Color
 
         if (!Control.Enabled)
         {
-            // If we are not in contrast theme OR we opted into the legacy behavior
+            // If we are not in HighContrast mode OR we opted into the legacy behavior
             if (!SystemInformation.HighContrast)
             {
                 border = ControlPaint.ContrastControlDark;
             }
 
-            // Otherwise we are in a contrast theme
+            // Otherwise we are in HighContrast mode
             field = SystemColors.Control;
         }
 

src/System.Windows.Forms/System/Windows/Forms/Controls/PropertyGrid/PropertyGridInternal/CategoryGridEntry.cs

@@ -121,7 +121,7 @@ public override void PaintLabel(
             Rectangle focusRect = new(indent, rect.Y, labelWidth + 3, rect.Height - 1);
             if (SystemInformation.HighContrast && !OwnerGrid.HasCustomLineColor)
             {
-                // Line color is SystemColors.ControlDarkDark in a contrast theme scenario.
+                // Line color is SystemColors.ControlDarkDark in high contrast mode.
                 ControlPaint.DrawFocusRectangle(g, focusRect, SystemColors.ControlText, OwnerGrid.LineColor);
             }
             else

src/System.Windows.Forms/System/Windows/Forms/Controls/ToolStrips/ToolStripSystemRenderer.cs

@@ -400,8 +400,8 @@ protected override void OnRenderImageMargin(ToolStripRenderEventArgs e)
     /// </summary>
     protected override void OnRenderButtonBackground(ToolStripItemRenderEventArgs e)
     {
-        // If the user selected a contrast theme in the OS and a specific renderer-override is defined, use that.
-        // For ToolStripSystemRenderer in a contrast theme, the RendererOverride property will be ToolStripHighContrastRenderer.
+        // If system in high contrast mode and specific renderer override is defined, use that.
+        // For ToolStripSystemRenderer in High Contrast mode the RendererOverride property will be ToolStripHighContrastRenderer.
         if (RendererOverride is not null)
         {
             base.OnRenderButtonBackground(e);
@@ -560,8 +560,8 @@ protected override void OnRenderToolStripStatusLabelBackground(ToolStripItemRend
     /// </summary>
     protected override void OnRenderSplitButtonBackground(ToolStripItemRenderEventArgs e)
     {
-        // If the user selected a contrast theme in the OS and a specific renderer-override is defined, use that.
-        // For ToolStripSystemRenderer in a contrast theme, the RendererOverride property will be ToolStripHighContrastRenderer.
+        // If system in high contrast mode and specific renderer override is defined, use that.
+        // For ToolStripSystemRenderer in High Contrast mode the RendererOverride property will be ToolStripHighContrastRenderer.
         if (RendererOverride is not null)
         {
             base.OnRenderSplitButtonBackground(e);