Merge pull request #1 from pcblues/Mods-for-#12042

Pull request for Issue dotnet#12042

Author: pcblues

src/System.Windows.Forms/src/System/Windows/Forms/Controls/ListView/ListView.cs

@@ -56,8 +56,7 @@ public partial class ListView : Control
     private View _viewStyle = View.LargeIcon;
     private string? _toolTipCaption = string.Empty;
 
-    // To hold created dark mode brush for deletion
-    private HBRUSH _hBrush;
+    private HBRUSH _hBrush; // To hold created dark mode brush for deletion
 
     private const int LISTVIEWSTATE_ownerDraw = 0x00000001;
     private const int LISTVIEWSTATE_allowColumnReorder = 0x00000002;

src/System.Windows.Forms/src/System/Windows/Forms/Controls/TreeView/TreeView.cs

@@ -60,6 +60,8 @@ public partial class TreeView : Control
     private bool _hoveredAlready;
     private bool _rightToLeftLayout;
 
+    private HBRUSH _hBrush;     // To hold created dark mode brush for deletion
+
     private nint _mouseDownNode = 0; // ensures we fire nodeClick on the correct node
 
     private const int TREEVIEWSTATE_hideSelection = 0x00000001;
@@ -3281,7 +3283,8 @@ protected override unsafe void WndProc(ref Message m)
             case PInvokeCore.WM_CTLCOLOREDIT:
                 // Default handling of edit label colors
                 m.ResultInternal = (LRESULT)0;
- #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.
+
+#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.
                 if (Application.IsDarkModeEnabled)
                 {
                     // Make background of dark mode edit labels the correct color