Author: jpobst
Date: 2008-01-29 11:30:48 -0500 (Tue, 29 Jan 2008)
New Revision: 94264
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
Log:
2008-01-29 Jonathan Pobst <[EMAIL PROTECTED]>
* Control.cs: Add MarshalAs attribute to Font getter for corcompare.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-01-29 16:30:45 UTC (rev 94263)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2008-01-29 16:30:48 UTC (rev 94264)
@@ -1,5 +1,9 @@
2008-01-29 Jonathan Pobst <[EMAIL PROTECTED]>
+ * Control.cs: Add MarshalAs attribute to Font getter for corcompare.
+
+2008-01-29 Jonathan Pobst <[EMAIL PROTECTED]>
+
* Form.cs: Handle Alt-Minus for MDI children forms.
* MdiWindowManager.cs: Make ShowPopup internal so Form can call it.
Add mnemonics to the control menu.
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2008-01-29 16:30:45 UTC (rev 94263)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Control.cs
2008-01-29 16:30:48 UTC (rev 94264)
@@ -2762,6 +2762,9 @@
[Localizable(true)]
[MWFCategory("Appearance")]
public virtual Font Font {
+#if NET_2_0
+ [return: MarshalAs (UnmanagedType.CustomMarshaler,
MarshalTypeRef = typeof (Font))]
+#endif
get {
if (font != null)
return font;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
