Merge pull request #2083 from hughbe/cursor-interop

Remove duplicate GetCursor interop
dotnet · Oct 15, 2019 · 64aa1a0 · 64aa1a0
2 parents 6502d50 + 19b43ef
commit 64aa1a0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/Common/src/NativeMethods.cs b/src/Common/src/NativeMethods.cs
@@ -3127,12 +3127,6 @@ public enum MONTCALENDAR_VIEW_MODE
         [DllImport(ExternDll.User32, ExactSpelling = true)]
         public static extern bool GetUpdateRect(IntPtr hwnd, ref RECT rc, bool fErase);
 
-        [DllImport(ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
-        public static extern IntPtr GetCursor();
-
-        [DllImport(ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
-        public static extern bool GetCursorPos(out Point pt);
-
         [DllImport(ExternDll.User32, ExactSpelling = true, CharSet = CharSet.Auto)]
         public static extern IntPtr SetParent(IntPtr hWnd, IntPtr hWndParent);
     }

diff --git a/src/System.Windows.Forms.Design/src/System.Windows.Forms.Design.csproj b/src/System.Windows.Forms.Design/src/System.Windows.Forms.Design.csproj
@@ -104,6 +104,8 @@
     <Compile Include="..\..\Common\src\Interop\User32\Interop.EndPaint.cs" Link="Interop\User32\Interop.EndPaint.cs" />
     <Compile Include="..\..\Common\src\Interop\User32\Interop.GetActiveWindow.cs" Link="Interop\User32\Interop.GetActiveWindow.cs" />
     <Compile Include="..\..\Common\src\Interop\User32\Interop.GetCapture.cs" Link="Interop\User32\Interop.GetCapture.cs" />
+    <Compile Include="..\..\Common\src\Interop\User32\Interop.GetCursor.cs" Link="Interop\User32\Interop.GetCursor.cs" />
+    <Compile Include="..\..\Common\src\Interop\User32\Interop.GetCursorPos.cs" Link="Interop\User32\Interop.GetCursorPos.cs" />
     <Compile Include="..\..\Common\src\Interop\User32\Interop.GetDC.cs" Link="Interop\User32\Interop.GetDC.cs" />
     <Compile Include="..\..\Common\src\Interop\User32\Interop.GetFocus.cs" Link="Interop\User32\Interop.GetFocus.cs" />
     <Compile Include="..\..\Common\src\Interop\User32\Interop.GetKeyState.cs" Link="Interop\User32\Interop.GetKeyState.cs" />

diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/BehaviorService.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/Behavior/BehaviorService.cs
@@ -816,7 +816,7 @@ protected override void OnDragEnter(DragEventArgs e)
                 if (!IsLocalDrag(e))
                 {
                     _behaviorService._validDragArgs = e;
-                    NativeMethods.GetCursorPos(out Point pt);
+                    User32.GetCursorPos(out Point pt);
                     NativeMethods.MapWindowPoints(IntPtr.Zero, Handle, ref pt, 1);
                     _behaviorService.PropagateHitTest(pt);
 
@@ -850,7 +850,7 @@ protected override void OnDragOver(DragEventArgs e)
                 if (!IsLocalDrag(e))
                 {
                     _behaviorService._validDragArgs = e;
-                    NativeMethods.GetCursorPos(out Point pt);
+                    User32.GetCursorPos(out Point pt);
                     NativeMethods.MapWindowPoints(IntPtr.Zero, Handle, ref pt, 1);
                     _behaviorService.PropagateHitTest(pt);
                 }
@@ -1407,7 +1407,7 @@ private void SetAppropriateCursor(Cursor cursor)
 
                 if (_toolboxSvc != null && _toolboxSvc.SetCursor())
                 {
-                    cursor = new Cursor(NativeMethods.GetCursor());
+                    cursor = new Cursor(User32.GetCursor());
                 }
             }
             _adornerWindow.Cursor = cursor;

diff --git a/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs b/src/System.Windows.Forms.Design/src/System/Windows/Forms/Design/CommandSet.cs
@@ -541,7 +541,7 @@ protected virtual bool OnKeyCancel(object sender)
                 if (tbx != null && tbx.GetSelectedToolboxItem((IDesignerHost)GetService(typeof(IDesignerHost))) != null)
                 {
                     tbx.SelectedToolboxItemUsed();
-                    NativeMethods.GetCursorPos(out Point p);
+                    User32.GetCursorPos(out Point p);
                     IntPtr hwnd = NativeMethods.WindowFromPoint(p.X, p.Y);
                     if (hwnd != IntPtr.Zero)
                     {