[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] r137147 - trunk/moon/class/System.Windows/Mono
From:       "Alan McGovern (alan.mcgovern () gmail ! com)"
Date:       2009-06-30 13:28:54
Message-ID: 20090630132854.85E809472C () mono-cvs ! ximian ! com
[Download RAW message or body]

Author: alanmc
Date: 2009-06-30 09:28:54 -0400 (Tue, 30 Jun 2009)
New Revision: 137147

Modified:
   trunk/moon/class/System.Windows/Mono/ChangeLog
   trunk/moon/class/System.Windows/Mono/MarkupExpressionParser.cs
Log:
2009-06-30  Alan McGovern  <amcgovern@novell.com>

	* class/System.Windows/Mono/MarkupExpressionParser.cs: Set the
	  source properly, it is provided by either value or
	  str_value, depending on which is non-null.

Modified: trunk/moon/class/System.Windows/Mono/ChangeLog
===================================================================
--- trunk/moon/class/System.Windows/Mono/ChangeLog	2009-06-30 12:42:16 UTC (rev 137146)
+++ trunk/moon/class/System.Windows/Mono/ChangeLog	2009-06-30 13:28:54 UTC (rev 137147)
@@ -1,3 +1,9 @@
+2009-06-30  Alan McGovern  <amcgovern@novell.com>
+
+	* MarkupExpressionParser.cs: Set the source properly, it is
+	  provided by either value or str_value, depending on which is
+	  non-null.
+
 2009-06-26  Chris Toshok  <toshok@ximian.com>
 
 	* GeneratedPInvokes.cs: regen.

Modified: trunk/moon/class/System.Windows/Mono/MarkupExpressionParser.cs
===================================================================
--- trunk/moon/class/System.Windows/Mono/MarkupExpressionParser.cs	2009-06-30 12:42:16 UTC (rev 137146)
+++ trunk/moon/class/System.Windows/Mono/MarkupExpressionParser.cs	2009-06-30 13:28:54 UTC (rev 137147)
@@ -247,7 +247,9 @@
 				b.Path = new PropertyPath (str_value);
 				break;
 			case "Source":
-				b.Source = value;
+				// if the expression was: Source="{StaticResource xxx}" then 'value' will be populated
+				// If the expression was  Source="5" then 'str_value' will be populated.
+				b.Source = value ?? str_value;
 				break;
 			case "Converter":
 				IValueConverter value_converter = value as IValueConverter;

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
[prev in list] [next in list] [prev in thread] [next in thread]