Author: fejj
Date: 2008-02-20 15:12:22 -0500 (Wed, 20 Feb 2008)
New Revision: 96311
Modified:
trunk/olive/class/agclr/System.Windows.Controls/ChangeLog
trunk/olive/class/agclr/System.Windows.Controls/TextBlock.cs
Log:
2008-02-20 Jeffrey Stedfast <[EMAIL PROTECTED]>
* TextBlock.cs (SetFontSource): It would appear that you can
actually set null as a downloader (equivalent to unsetting it)
according to the MS test suite.
Modified: trunk/olive/class/agclr/System.Windows.Controls/ChangeLog
===================================================================
--- trunk/olive/class/agclr/System.Windows.Controls/ChangeLog 2008-02-20
20:12:13 UTC (rev 96310)
+++ trunk/olive/class/agclr/System.Windows.Controls/ChangeLog 2008-02-20
20:12:22 UTC (rev 96311)
@@ -1,3 +1,9 @@
+2008-02-20 Jeffrey Stedfast <[EMAIL PROTECTED]>
+
+ * TextBlock.cs (SetFontSource): It would appear that you can
+ actually set null as a downloader (equivalent to unsetting it)
+ according to the MS test suite.
+
2007-11-09 Jeffrey Stedfast <[EMAIL PROTECTED]>
* MediaElement.cs (InvokeMediaOpened): Always pass null as the
Modified: trunk/olive/class/agclr/System.Windows.Controls/TextBlock.cs
===================================================================
--- trunk/olive/class/agclr/System.Windows.Controls/TextBlock.cs
2008-02-20 20:12:13 UTC (rev 96310)
+++ trunk/olive/class/agclr/System.Windows.Controls/TextBlock.cs
2008-02-20 20:12:22 UTC (rev 96311)
@@ -126,12 +126,12 @@
public void SetFontSource (DependencyObject Downloader)
{
- if (Downloader == null)
- throw new ArgumentNullException ("Downloader");
-
- Downloader dl = (Downloader as Downloader);
- if (dl != null)
+ if (Downloader != null) {
+ Downloader dl = (Downloader as Downloader);
NativeMethods.text_block_set_font_source
(native, dl.native);
+ } else {
+ NativeMethods.text_block_set_font_source
(native, IntPtr.Zero);
+ }
}
internal override Kind GetKind ()
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
