Replace CSC enum with CommandStateChangeConstants enum from CsWin…

…32 (#9913) Replace CSC enum with CommandStateChangeConstants enum from CsWin32
dotnet · Sep 15, 2023 · 549eb61 · 549eb61
1 parent e628e1f
commit 549eb61
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 20 deletions.
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/SHDocVw/Interop.CSC.cs b/src/System.Windows.Forms.Primitives/src/Interop/SHDocVw/Interop.CSC.cs
diff --git a/src/System.Windows.Forms.Primitives/src/Interop/SHDocVw/Interop.DWebBrowserEvents2.cs b/src/System.Windows.Forms.Primitives/src/Interop/SHDocVw/Interop.DWebBrowserEvents2.cs
@@ -5,7 +5,7 @@
 
 internal partial class Interop
 {
-    internal partial class SHDocVw
+    internal static partial class SHDocVw
     {
         [ComImport]
         [Guid("34A715A0-6587-11D0-924A-0020AFC7AC4D")]
@@ -24,7 +24,7 @@ void ProgressChange(
 
             [DispId(105)]
             void CommandStateChange(
-                SHDocVw.CSC command,
+                CommandStateChangeConstants command,
                 bool enable);
 
             [DispId(106)]

diff --git a/src/System.Windows.Forms.Primitives/src/NativeMethods.txt b/src/System.Windows.Forms.Primitives/src/NativeMethods.txt
@@ -47,6 +47,7 @@ CoGetClassObject
 COLOR_*
 CombineRgn
 COMDLG_FILTERSPEC
+CommandStateChangeConstants
 CommDlgExtendedError
 COPYDATASTRUCT
 CopyImage

diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/WebBrowser.WebBrowserEvent.cs b/src/System.Windows.Forms/src/System/Windows/Forms/WebBrowser.WebBrowserEvent.cs
@@ -23,13 +23,13 @@ public WebBrowserEvent(WebBrowser parent)
 
         public bool AllowNavigation { get; set; }
 
-        public void CommandStateChange(SHDocVw.CSC command, bool enable)
+        public void CommandStateChange(CommandStateChangeConstants command, bool enable)
         {
-            if (command == SHDocVw.CSC.NAVIGATEBACK)
+            if (command == CommandStateChangeConstants.CSC_NAVIGATEBACK)
             {
                 _parent.CanGoBackInternal = enable;
             }
-            else if (command == SHDocVw.CSC.NAVIGATEFORWARD)
+            else if (command == CommandStateChangeConstants.CSC_NAVIGATEFORWARD)
             {
                 _parent.CanGoForwardInternal = enable;
             }