Revert "Add Dark Mode theme to rows/columns and ColumnHeader/RowHeader in the DataGridView"

This reverts commit 8cd6f2b.

Author: KlausLoeffelmann

src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridViewButtonCell.cs

@@ -17,11 +17,7 @@ public partial class DataGridViewButtonCell : DataGridViewCell
     private static readonly int s_propButtonCellFlatStyle = PropertyStore.CreateKey();
     private static readonly int s_propButtonCellState = PropertyStore.CreateKey();
     private static readonly int s_propButtonCellUseColumnTextForButtonValue = PropertyStore.CreateKey();
-#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-    private static readonly VisualStyleElement s_darkButtonElement = VisualStyleElement.CreateElement("DarkMode_Explorer::BUTTON", 1, 1);
-    private static readonly VisualStyleElement s_lightButtonElement = VisualStyleElement.Button.PushButton.Normal;
-    private static readonly VisualStyleElement s_buttonElement = Application.IsDarkModeEnabled ? s_darkButtonElement : s_lightButtonElement;
-#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+    private static readonly VisualStyleElement s_buttonElement = VisualStyleElement.Button.PushButton.Normal;
 
     private const byte DATAGRIDVIEWBUTTONCELL_themeMargin = 100; // Used to calculate the margins required for theming rendering
     private const byte DATAGRIDVIEWBUTTONCELL_horizontalTextMargin = 2;

src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridViewCheckBoxCell.cs

@@ -20,12 +20,7 @@ public partial class DataGridViewCheckBoxCell : DataGridViewCell, IDataGridViewE
     private const DataGridViewContentAlignment AnyBottom = DataGridViewContentAlignment.BottomRight | DataGridViewContentAlignment.BottomCenter | DataGridViewContentAlignment.BottomLeft;
     private const DataGridViewContentAlignment AnyMiddle = DataGridViewContentAlignment.MiddleRight | DataGridViewContentAlignment.MiddleCenter | DataGridViewContentAlignment.MiddleLeft;
 
-#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-    private static readonly VisualStyleElement s_darkCheckBoxElement = VisualStyleElement.CreateElement("DarkMode_Explorer::BUTTON", 3, 1);
-    private static readonly VisualStyleElement s_lightCheckBoxElement = VisualStyleElement.Button.CheckBox.UncheckedNormal;
-    private static readonly VisualStyleElement s_checkBoxElement = Application.IsDarkModeEnabled ? s_darkCheckBoxElement : s_lightCheckBoxElement;
-#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-
+    private static readonly VisualStyleElement s_checkBoxElement = VisualStyleElement.Button.CheckBox.UncheckedNormal;
     private static readonly int s_propButtonCellState = PropertyStore.CreateKey();
     private static readonly int s_propTrueValue = PropertyStore.CreateKey();
     private static readonly int s_propFalseValue = PropertyStore.CreateKey();

src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridViewColumnHeaderCell.DataGridViewColumnHeaderCellRenderer.cs

@@ -16,11 +16,7 @@ public static VisualStyleRenderer VisualStyleRenderer
         {
             get
             {
-#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-                s_visualStyleRenderer ??= new VisualStyleRenderer(Application.IsDarkModeEnabled ?
-                    VisualStyleElement.CreateElement("DarkMode_ItemsView::Header", 1, 1)
-                    : VisualStyleElement.Header.Item.Normal);
-#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+                s_visualStyleRenderer ??= new VisualStyleRenderer(s_headerElement);
 
                 return s_visualStyleRenderer;
             }

src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridViewColumnHeaderCell.cs

@@ -11,11 +11,7 @@ namespace System.Windows.Forms;
 
 public partial class DataGridViewColumnHeaderCell : DataGridViewHeaderCell
 {
-#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-    private static readonly VisualStyleElement s_headerElement = Application.IsDarkModeEnabled ?
-        VisualStyleElement.CreateElement("DarkMode_ItemsView::Header", 1, 1)
-        : VisualStyleElement.Header.Item.Normal;
-#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+    private static readonly VisualStyleElement s_headerElement = VisualStyleElement.Header.Item.Normal;
 
     private const byte SortGlyphSeparatorWidth = 2;     // additional 2 pixels between caption and glyph
     private const byte SortGlyphHorizontalMargin = 4;   // 4 pixels on left & right of glyph

src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridViewComboBoxCell.DataGridViewComboBoxCellRenderer.cs

@@ -12,29 +12,10 @@ private static class DataGridViewComboBoxCellRenderer
     {
         [ThreadStatic]
         private static VisualStyleRenderer? t_visualStyleRenderer;
-#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-        private static readonly VisualStyleElement s_comboBoxBorder = Application.IsDarkModeEnabled ?
-            VisualStyleElement.CreateElement("DarkMode_CFD::COMBOBOX", 4, 1)
-            : VisualStyleElement.ComboBox.Border.Normal;
-#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-
-#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-        private static readonly VisualStyleElement s_comboBoxDropDownButtonRight = Application.IsDarkModeEnabled ?
-            VisualStyleElement.CreateElement("DarkMode_CFD::COMBOBOX", 6, 1)
-            : VisualStyleElement.ComboBox.DropDownButtonRight.Normal;
-#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-
-#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-        private static readonly VisualStyleElement s_comboBoxDropDownButtonLeft = Application.IsDarkModeEnabled ?
-            VisualStyleElement.CreateElement("DarkMode_CFD::COMBOBOX", 7, 1) :
-            VisualStyleElement.ComboBox.DropDownButtonLeft.Normal;
-#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-
-#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-        private static readonly VisualStyleElement s_comboBoxReadOnlyButton = Application.IsDarkModeEnabled ?
-            VisualStyleElement.CreateElement("DarkMode_CFD::COMBOBOX", 5, 1)
-            : VisualStyleElement.ComboBox.ReadOnlyButton.Normal;
-#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+        private static readonly VisualStyleElement s_comboBoxBorder = VisualStyleElement.ComboBox.Border.Normal;
+        private static readonly VisualStyleElement s_comboBoxDropDownButtonRight = VisualStyleElement.ComboBox.DropDownButtonRight.Normal;
+        private static readonly VisualStyleElement s_comboBoxDropDownButtonLeft = VisualStyleElement.ComboBox.DropDownButtonLeft.Normal;
+        private static readonly VisualStyleElement s_comboBoxReadOnlyButton = VisualStyleElement.ComboBox.ReadOnlyButton.Normal;
 
         public static VisualStyleRenderer VisualStyleRenderer
         {

src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridViewRowHeaderCell.cs

@@ -11,11 +11,7 @@ namespace System.Windows.Forms;
 
 public partial class DataGridViewRowHeaderCell : DataGridViewHeaderCell
 {
-#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-    private static readonly VisualStyleElement s_headerElement = Application.IsDarkModeEnabled ?
-        VisualStyleElement.CreateElement("DarkMode_ItemsView::Header", 1, 1)
-        : VisualStyleElement.Header.Item.Normal;
-#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+    private static readonly VisualStyleElement s_headerElement = VisualStyleElement.Header.Item.Normal;
 
     private static Bitmap? s_rightArrowBmp;
     private static Bitmap? s_leftArrowBmp;

src/System.Windows.Forms/System/Windows/Forms/Controls/DataGridView/DataGridViewTopLeftHeaderCell.cs

@@ -8,11 +8,7 @@ namespace System.Windows.Forms;
 
 public partial class DataGridViewTopLeftHeaderCell : DataGridViewColumnHeaderCell
 {
-#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-    private static readonly VisualStyleElement s_headerElement = Application.IsDarkModeEnabled ?
-        VisualStyleElement.CreateElement("DarkMode_ItemsView::Header", 1, 1)
-        : VisualStyleElement.Header.Item.Normal;
-#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+    private static readonly VisualStyleElement s_headerElement = VisualStyleElement.Header.Item.Normal;
 
     private const byte DATAGRIDVIEWTOPLEFTHEADERCELL_horizontalTextMarginLeft = 1;
     private const byte DATAGRIDVIEWTOPLEFTHEADERCELL_horizontalTextMarginRight = 2;

src/System.Windows.Forms/System/Windows/Forms/Controls/TabControl/TabRenderer.cs

@@ -144,16 +144,7 @@ public static void DrawTabPage(Graphics g, Rectangle bounds)
 
     internal static void DrawTabPage(IDeviceContext deviceContext, Rectangle bounds)
     {
-#pragma warning disable WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
-        // Using DarkMode Theme Subclass.
-        // see https://learn.microsoft.com/en-us/windows/win32/controls/theme-subclasses.
-        VisualStyleElement darkTabPaneElement = VisualStyleElement.CreateElement("DarkMode::ExplorerNavPane", 0, 0);
-        VisualStyleElement lightTabPaneElement = VisualStyleElement.Tab.Pane.Normal;
-        VisualStyleElement tabPaneElement = Application.IsDarkModeEnabled
-            ? darkTabPaneElement
-            : lightTabPaneElement;
-        InitializeRenderer(tabPaneElement, 0);
-#pragma warning restore WFO5001 // Type is for evaluation purposes only and is subject to change or removal in future updates. Suppress this diagnostic to proceed.
+        InitializeRenderer(VisualStyleElement.Tab.Pane.Normal, 0);
         t_visualStyleRenderer.DrawBackground(deviceContext, bounds);
     }