2007-05-28 Andreia Gaita <avidigal@novell.com>

* X11Dnd.cs: A direct cast to VirtualKeys is not allowed from
an IntPtr on csc (it builds fine on mcs, could it be a compiler
bug?), convert the ptr to Int32 first.

svn path=/trunk/mcs/; revision=78073

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index caafc7b152a55a1afe0c53a05b54ed20d2bdee4f..3bb23c2b5ef66c9fab327898ab8acd4166d8f2df 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-28  Andreia Gaita  <avidigal@novell.com>
+
+       * X11Dnd.cs: A direct cast to VirtualKeys is not allowed from
+       an IntPtr on csc (it builds fine on mcs, could it be a compiler
+       bug?), convert the ptr to Int32 first.
+
 2007-05-28  Jackson Harper  <jackson@ximian.com>
 
        * X11Dnd.cs: Add a timer, so after drop, if a finish is not

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Dnd.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Dnd.cs
index 16716575cd930c670b486371a59bbace2fcc243f..7851a8b6e267bc33ad5de42fc38b042da0651210 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Dnd.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/X11Dnd.cs
@@ -559,7 +559,7 @@ namespace System.Windows.Forms {
 
                public void HandleKeyMessage (MSG msg)
                {
-                       if (VirtualKeys.VK_ESCAPE == (VirtualKeys) msg.wParam) {
+                       if (VirtualKeys.VK_ESCAPE == (VirtualKeys) msg.wParam.ToInt32()) {
                                QueryContinue (true, DragAction.Cancel);
                        }
                }