2005-06-02 Peter Bartok <pbartok@novell.com>

	* Control.cs: Removed MonoTODO from DoDragDrop and added call to Xplat
	* XplatUI.cs: Added DoDragDrop() method
	* XplatUIDriver.cs: Added DoDragDrop() method

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index b6ae96133fd5f7915183353011f7ae8ef2c6de59..1dfb802bd1ca01a6389ece0697ebd6b27389d227 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 @@
+2005-06-02  Peter Bartok  <pbartok@novell.com>
+
+       * Control.cs: Removed MonoTODO from DoDragDrop and added call to Xplat
+       * XplatUI.cs: Added DoDragDrop() method
+       * XplatUIDriver.cs: Added DoDragDrop() method
+
 2005-06-02  Jackson Harper  <jackson@ximian.com>
 
        * Splitter.cs: Implement BorderStyle.

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
index a44259aac6ce0b6c5f485c25e1be2c2cb5f32002..631beb50e2f63d9d023affb019b201fda085adc5 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
@@ -2114,7 +2114,7 @@ namespace System.Windows.Forms
 
                [MonoTODO("Come up with cross platform drag-drop driver interface")]
                public DragDropEffects DoDragDrop(object data, DragDropEffects allowedEffects) {
-                       return DragDropEffects.None;
+                       return XplatUI.StartDrag(data, allowedEffects);
                }
 
                [EditorBrowsable(EditorBrowsableState.Advanced)]

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
index 407660905754f76f7b5c3304b636737560c3cf3d..9596b2e1fd77601b0da2349c9dd26758f7432f55 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUI.cs
@@ -716,6 +716,13 @@ namespace System.Windows.Forms {
                        driver.ShowCursor(show);
                }
 
+               internal static void StartDrag(object data, DragDropEffects allowedEffects) {
+                       #if DriverDebug
+                       Console.WriteLine ("StartDrag({0}, {1}): Called", data, allowedEffects);
+                       #endif
+                       driver.StartDrag (data, allowedEffects);
+               }
+
                internal static bool SystrayAdd(IntPtr handle, string tip, Icon icon, out ToolTip tt) {
                        #if DriverDebug
                                Console.WriteLine("SystrayAdd({0:X}, {1}): Called", handle.ToInt32(), tip);

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
index 05260eede25f3e306a03e4a02dba1691196946d5..8c05944ceadd8e96f1e52cba5e8e724880f098a6 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIDriver.cs
@@ -126,6 +126,11 @@ namespace System.Windows.Forms {
                                        "not supported on this platform");
                }
 
+               internal virtual void StartDrag(object data, DragDropEffects allowedEffects) {
+                       Console.Error.WriteLine ("Drag and Drop is currently " +
+                                       "not supported on this platform");
+               }
+
                internal abstract void SetBorderStyle(IntPtr handle, BorderStyle border_style);
                internal abstract void SetMenu(IntPtr handle, IntPtr menu_handle);