Author: jpobst
Date: 2007-02-23 22:50:52 -0500 (Fri, 23 Feb 2007)
New Revision: 73382
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Clipboard.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
Log:
2007-02-23 Jonathan Pobst <[EMAIL PROTECTED]>
* Clipboard.cs: Partially implement an overload of SetDataObject.
* Form.cs: Implement ShowWithoutActivation.
* XPlatUIWin32.cs: Fix for WM_SHOWNOACTIVATE for forms.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-02-24 01:11:10 UTC (rev 73381)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-02-24 03:50:52 UTC (rev 73382)
@@ -1,3 +1,9 @@
+2007-02-23 Jonathan Pobst <[EMAIL PROTECTED]>
+
+ * Clipboard.cs: Partially implement an overload of SetDataObject.
+ * Form.cs: Implement ShowWithoutActivation.
+ * XPlatUIWin32.cs: Fix for WM_SHOWNOACTIVATE for forms.
+
2007-02-23 Carlos Alberto Cortez <[EMAIL PROTECTED]>
This is a first set of changes to make the Virtual mode works,
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Clipboard.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Clipboard.cs
2007-02-24 01:11:10 UTC (rev 73381)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Clipboard.cs
2007-02-24 03:50:52 UTC (rev 73382)
@@ -241,6 +241,19 @@
}
#if NET_2_0
+ [MonoTODO ("Actually respect retryTimes, retryDelay.")]
+ public static void SetDataObject (object data, bool copy, int
retryTimes, int retryDelay)
+ {
+ if (data == null)
+ throw new ArgumentNullException("data");
+ if (retryTimes < 0)
+ throw new
ArgumentOutOfRangeException("retryTimes");
+ if (retryDelay < 0)
+ throw new
ArgumentOutOfRangeException("retryDelay");
+
+ SetDataObject(data, copy);
+ }
+
[MonoInternalNote ("Needs additional checks for valid paths,
see MSDN")]
public static void SetFileDropList (StringCollection filePaths)
{
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2007-02-24 01:11:10 UTC (rev 73381)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Form.cs
2007-02-24 03:50:52 UTC (rev 73382)
@@ -1281,6 +1281,12 @@
}
}
}
+#if NET_2_0
+ [MonoTODO ("Implemented for Win32, needs X11 implementation")]
+ protected virtual bool ShowWithoutActivation {
+ get { return false; }
+ }
+#endif
#endregion // Protected Instance Properties
#region Public Static Methods
@@ -1594,6 +1600,9 @@
}
}
+ if (this.ShowWithoutActivation)
+ Hwnd.ObjectFromHandle (this.Handle).no_activate
= true;
+
XplatUI.SetWindowMinMax(window.Handle,
maximized_bounds, minimum_size, maximum_size);
if ((FormBorderStyle != FormBorderStyle.FixedDialog) &&
(icon != null)) {
XplatUI.SetIcon(window.Handle, icon);
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
2007-02-24 01:11:10 UTC (rev 73381)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
2007-02-24 03:50:52 UTC (rev 73382)
@@ -1718,7 +1718,7 @@
}
if (Hwnd.ObjectFromHandle
(handle).no_activate)
- flags |=
WindowPlacementFlags.SW_SHOWNOACTIVATE;
+ flags =
WindowPlacementFlags.SW_SHOWNOACTIVATE;
Win32ShowWindow (handle, flags);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
