Permalink
Browse files

Move more things out of ReactiveUI.Xaml and into ReactiveUI proper

  • Loading branch information...
1 parent eab55a6 commit aba0c57880461424e3a7546bcf4957679e22def0 @paulcbetts paulcbetts committed Mar 27, 2013
@@ -92,12 +92,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP8.csproj">
- <Project>{06C34984-B706-49BF-85BB-9282DD6238D1}</Project>
- <Name>ReactiveUI.Xaml_WP8</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
<None Include="app.config" />
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
@@ -126,10 +126,6 @@
<Compile Include="WP8AutoSuspendApplication.cs" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\ReactiveUI.Xaml\ReactiveUI.Xaml_WP8.csproj">
- <Project>{06C34984-B706-49BF-85BB-9282DD6238D1}</Project>
- <Name>ReactiveUI.Xaml_WP8</Name>
- </ProjectReference>
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj">
<Project>{464CB812-F99F-401B-BE4C-E8F0515CD19D}</Project>
<Name>ReactiveUI</Name>
@@ -14,59 +14,6 @@
namespace ReactiveUI.Xaml
{
- public interface ICreatesCommandBinding
- {
- /// <summary>
- /// Returns a positive integer when this class supports
- /// BindCommandToObject for this particular Type. If the method
- /// isn't supported at all, return a non-positive integer. When multiple
- /// implementations return a positive value, the host will use the one
- /// which returns the highest value. When in doubt, return '2' or '0'
- /// </summary>
- /// <param name="type">The type to query for.</param>
- /// <param name="hasEventTarget">If true, the host intends to use a custom
- /// event target.</param>
- /// <returns>A positive integer if BCTO is supported, zero or a negative
- /// value otherwise</returns>
- int GetAffinityForObject(Type type, bool hasEventTarget);
-
- /// <summary>
- /// Bind an ICommand to a UI object, in the "default" way. The meaning
- /// of this is dependent on the implementation. Implement this if you
- /// have a new type of UI control that doesn't have
- /// Command/CommandParameter like WPF or has a non-standard event name
- /// for "Invoke".
- /// </summary>
- /// <param name="command">The command to bind</param>
- /// <param name="target">The target object, usually a UI control of
- /// some kind</param>
- /// <param name="commandParameter">An IObservable source whose latest
- /// value will be passed as the command parameter to the command. Hosts
- /// will always pass a valid IObservable, but this may be
- /// Observable.Empty</param>
- /// <returns>An IDisposable which will disconnect the binding when
- /// disposed.</returns>
- IDisposable BindCommandToObject(ICommand command, object target, IObservable<object> commandParameter);
-
- /// <summary>
- /// Bind an ICommand to a UI object to a specific event. This event may
- /// be a standard .NET event, or it could be an event derived in another
- /// manner (i.e. in MonoTouch).
- /// </summary>
- /// <param name="command">The command to bind</param>
- /// <param name="target">The target object, usually a UI control of
- /// some kind</param>
- /// <param name="commandParameter">An IObservable source whose latest
- /// value will be passed as the command parameter to the command. Hosts
- /// will always pass a valid IObservable, but this may be
- /// Observable.Empty</param>
- /// <param name="eventName">The event to bind to.</param>
- /// <returns></returns>
- /// <returns>An IDisposable which will disconnect the binding when
- /// disposed.</returns>
- IDisposable BindCommandToObject<TEventArgs>(ICommand command, object target, IObservable<object> commandParameter, string eventName) where TEventArgs : EventArgs;
- }
-
public class CreatesCommandBindingViaEvent : ICreatesCommandBinding
{
// NB: These are in priority order
@@ -132,7 +132,6 @@
<ItemGroup>
<Compile Include="AutoDataTemplateBindingHook.cs" />
<Compile Include="BindingTypeConverters.cs" />
- <Compile Include="CommandBinding.cs" />
<Compile Include="CreatesCommandBinding.cs" />
<Compile Include="DependencyObjectObservableForProperty.cs" />
<Compile Include="Errors.cs" />
@@ -142,7 +141,6 @@
<Compile Include="ServiceLocationRegistration.cs" />
<Compile Include="TransitioningContentControl.cs" />
<Compile Include="ViewModelViewHost.cs" />
- <Compile Include="WaitForDispatcherScheduler.cs" />
<Compile Include="XamlDefaultPropertyBinding.cs" />
</ItemGroup>
<ItemGroup>
@@ -110,7 +110,6 @@
<ItemGroup>
<Compile Include="AutoDataTemplateBindingHook.cs" />
<Compile Include="BindingTypeConverters.cs" />
- <Compile Include="CommandBinding.cs" />
<Compile Include="CreatesCommandBinding.cs" />
<Compile Include="DependencyObjectObservableForProperty.cs" />
<Compile Include="Errors.cs" />
@@ -122,7 +121,6 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="ViewModelViewHost.cs" />
- <Compile Include="WaitForDispatcherScheduler.cs" />
<Compile Include="XamlDefaultPropertyBinding.cs" />
</ItemGroup>
<ItemGroup>
@@ -36,7 +36,6 @@
<ItemGroup>
<Compile Include="AutoDataTemplateBindingHook.cs" />
<Compile Include="BindingTypeConverters.cs" />
- <Compile Include="CommandBinding.cs" />
<Compile Include="CreatesCommandBinding.cs" />
<Compile Include="DependencyObjectObservableForProperty.cs" />
<Compile Include="Errors.cs" />
@@ -46,7 +45,6 @@
<Compile Include="ServiceLocationRegistration.cs" />
<Compile Include="TransitioningContentControl.WinRT.cs" />
<Compile Include="ViewModelViewHost.cs" />
- <Compile Include="WaitForDispatcherScheduler.cs" />
<Compile Include="XamlDefaultPropertyBinding.cs" />
</ItemGroup>
<ItemGroup>
Oops, something went wrong.

0 comments on commit aba0c57

Please sign in to comment.