Updated for WPF 4.0

markjulmar · Nov 19, 2013 · ac71e55 · ac71e55
1 parent d195c61
commit ac71e55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Julmar.Wpf.Helpers/Julmar.Wpf.Behaviors/Julmar.Wpf.Behaviors (4.0).csproj b/Julmar.Wpf.Helpers/Julmar.Wpf.Behaviors/Julmar.Wpf.Behaviors (4.0).csproj
@@ -66,6 +66,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft SDKs\Expression\Blend\.NETFramework\v4.0\Libraries\Microsoft.Expression.Interactions.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -79,6 +83,7 @@
   <ItemGroup>
     <Compile Include="Actions\ApplyEffect.cs" />
     <Compile Include="Actions\ChangeThemeAction.cs" />
+    <Compile Include="Actions\GotoVisualStateAction.cs" />
     <Compile Include="Actions\InvokeCommand.cs" />
     <Compile Include="Actions\SelectAllTextAction.cs" />
     <Compile Include="Actions\SetFocusAction.cs" />

diff --git a/Julmar.Wpf.Helpers/Julmar.Wpf.Behaviors/Triggers/ViewModelTrigger.cs b/Julmar.Wpf.Helpers/Julmar.Wpf.Behaviors/Triggers/ViewModelTrigger.cs
@@ -157,7 +157,7 @@ private void RaiseTriggerNoParams()
         {
             if (!this.Dispatcher.CheckAccess())
             {
-                this.Dispatcher.Invoke(this.RaiseTriggerNoParams);
+                this.Dispatcher.Invoke((Action)this.RaiseTriggerNoParams);
                 return;
             }
             this.InvokeActions(null);
@@ -171,7 +171,7 @@ private void RaiseTriggerWithParameter(object parameter)
         {
             if (!this.Dispatcher.CheckAccess())
             {
-                this.Dispatcher.Invoke(() => this.RaiseTriggerWithParameter(parameter));
+                this.Dispatcher.Invoke((Action)(() => this.RaiseTriggerWithParameter(parameter)));
                 return;
             }
             this.InvokeActions(parameter);