jacksonh

diff --git a/class/WPF.Toolkit/VSM/System/Windows/VisualStateManager.cs b/class/WPF.Toolkit/VSM/System/Windows/VisualStateManager.cs
index d86d465..8e002f9 100644
--- a/class/WPF.Toolkit/VSM/System/Windows/VisualStateManager.cs
+++ b/class/WPF.Toolkit/VSM/System/Windows/VisualStateManager.cs
@@ -14,10 +14,11 @@ using System.Windows.Media.Animation;
 
 namespace System.Windows
 {
-       class VisualStateGroupCollection : PresentationFrameworkCollection<VisualStateGroup>
+       class VisualStateGroupCollection : Collection<VisualStateGroup>

jacksonh

diff --git a/class/System.Windows/System.Windows.Controls.Primitives/Selector.cs b/class/System.Windows/System.Windows.Controls.Primitives/Selector.cs
index fd6393f..34c4aec 100644
--- a/class/System.Windows/System.Windows.Controls.Primitives/Selector.cs
+++ b/class/System.Windows/System.Windows.Controls.Primitives/Selector.cs
@@ -52,8 +52,11 @@ namespace System.Windows.Controls.Primitives {
                
                public static readonly DependencyProperty SelectedValuePathProperty = 
                        DependencyProperty.Register ("SelectedValuePath", typeof (string), typeof (Selector), new PropertyMetadata ("", OnSelectedValuePathChanged));
-               
-               

jacksonh

diff --git a/class/System.Windows/System.Windows/Application.cs b/class/System.Windows/System.Windows/Application.cs
index 97d2091..ba82eb1 100644
--- a/class/System.Windows/System.Windows/Application.cs
+++ b/class/System.Windows/System.Windows/Application.cs
@@ -491,12 +491,34 @@ namespace System.Windows {
                        resource = Path.GetFullPath (resource);
                        resource = resource [0] == '/' ? resource.Substring (1) : resource;
 
+                       bool check_all = false;
+                       if (uriResource.ToString ().StartsWith ("../")) {

jacksonh

diff --git a/class/System.Windows/System.Windows/DependencyObject.cs b/class/System.Windows/System.Windows/DependencyObject.cs
index 7da7922..2de2c71 100644
--- a/class/System.Windows/System.Windows/DependencyObject.cs
+++ b/class/System.Windows/System.Windows/DependencyObject.cs
@@ -88,6 +88,15 @@ namespace System.Windows {
                        get; set;
                }
 
+               internal string ResourceBase {
+                       get {

jacksonh

diff --git a/class/System.Windows/Mono.Xaml/MarkupExpressionParser.cs b/class/System.Windows/Mono.Xaml/MarkupExpressionParser.cs
index e25f2dd..e73464b 100644
--- a/class/System.Windows/Mono.Xaml/MarkupExpressionParser.cs
+++ b/class/System.Windows/Mono.Xaml/MarkupExpressionParser.cs
@@ -77,7 +77,29 @@ namespace Mono.Xaml {
 
 		protected override PropertyPath ParsePropertyPath (string piece)
 		{
-			return new PropertyPath (piece);
+			Kind k = Deployment.Current.Types.TypeToKind (typeof (PropertyPath));

jacksonh

-rw------- 1 jackson users 182M 2010-09-01 12:44 /home/jackson/.mozilla/firefox/1ejyji20.default/sessionstore.bak
-rw------- 1 jackson users 182M 2010-09-01 11:41 /home/jackson/.mozilla/firefox/1ejyji20.default/sessionstore.js

jacksonh

Exception has been thrown by the target of an invocation. ---> System.InvalidOperationException: This operation is not supported for a relative URI.
  at System.Uri.EnsureAbsoluteUri () [0x00016] in Uri.cs:2145 
  at System.Uri.get_Scheme () [0x00000] in Uri.cs:597 
  at System.UriBuilder..ctor (System.Uri uri) [0x00000] in <filename unknown>:0 

jacksonh

if (!source.IsAbsoluteUri) {
					Console.WriteLine ("I want to combine: '{0}' with '{1}'", ResourceBase, source.ToString ());

					Uri resource_base = ResourceBase;
					if (resource_base.IsAbsoluteUri) {
						string base_str = Path.GetDirectoryName (resource_base.AbsolutePath);
						string full = Path.Combine (base_str, source.ToString ());
						source = new Uri (full);
					} else {
						string base_str = Path.GetDirectoryName (resource_base.ToString ());

jacksonh

parsing
<Binding xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:i="clr-namespace:Microsoft.Pivot.Internal.Interactivity;assembly=System.Windows.Pivot.SharedUI"
         Path="(i:Behavior.InternalDataContext)"/>
parsing
done parsing
done parsing

                                                                <Grid Background="Transparent" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
                                                                    <vsm:VisualStateManager.VisualStateGroups xmlns:vsm="clr-namespace:System.Windows;assembly=System.Windows">

jacksonh

"<threadpool thread>" tid=0x0x7faed98ed710 this=0x0x7faedb7b2b80 thread handle 0x413 state : not waiting owns ()
  at Mono.NativeDependencyObjectHelper.CheckNativeAndThread (Mono.INativeDependencyObjectWrapper) [0x00046] in /home/jackson/Projects/mono/moon/class/System.Windows/Mono/NativeDependencyObjectHelper.cs:600
  at Mono.NativeDependencyObjectHelper.SetValue (Mono.INativeDependencyObjectWrapper,System.Windows.DependencyProperty,object) [0x00011] in /home/jackson/Projects/mono/moon/class/System.Windows/Mono/NativeDependencyObjectHelper.cs:179
  at System.Windows.DependencyObject.SetValueImpl (System.Windows.DependencyProperty,object) [0x0015e] in /home/jackson/Projects/mono/moon/class/System.Windows/System.Windows/DependencyObject.cs:437
  at System.Windows.DependencyObject.SetValue (System.Windows.DependencyProperty,object) [0x00033] in /home/jackson/Projects/mono/moon/class/System.Windows/System.Windows/DependencyObject.cs:388
  at System.Windows.Media.Animation.Timeline.set_Duration (System.Windows.Du