From cc0aa0ec3cfa7bb71c39b591edb84414c45cfa51 Mon Sep 17 00:00:00 2001 From: Nicolas VERINAUD Date: Fri, 16 Jan 2015 12:41:44 +0100 Subject: [PATCH] Update ReactiveNSView : add .ctor(CGRect) for Unified API. --- ReactiveUI/Cocoa/ReactiveNSView.cs | 29 ++++++++++++++++++----------- ReactiveUI_XSIOS.sln | 29 ++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/ReactiveUI/Cocoa/ReactiveNSView.cs b/ReactiveUI/Cocoa/ReactiveNSView.cs index 5db87036bb..82f4c50d23 100644 --- a/ReactiveUI/Cocoa/ReactiveNSView.cs +++ b/ReactiveUI/Cocoa/ReactiveNSView.cs @@ -1,26 +1,27 @@ using System; -using System.Drawing; -using System.Runtime.Serialization; -using System.Reactive.Subjects; -using System.Reactive.Concurrency; -using System.Reflection; +using System.Collections.Generic; using System.ComponentModel; +using System.Diagnostics.Contracts; +using System.Drawing; using System.Linq; -using System.Threading; +using System.Reactive; +using System.Reactive.Concurrency; using System.Reactive.Disposables; -using System.Diagnostics.Contracts; +using System.Reactive.Subjects; +using System.Reflection; using System.Runtime.CompilerServices; -using System.Collections.Generic; +using System.Runtime.Serialization; +using System.Threading; using Splat; -using System.Reactive; #if UNIFIED -using UIKit; +using CoreGraphics; using Foundation; using NSView = UIKit.UIView; +using UIKit; #elif UIKIT -using MonoTouch.UIKit; using MonoTouch.Foundation; +using MonoTouch.UIKit; using NSView = MonoTouch.UIKit.UIView; #else using MonoMac.AppKit; @@ -51,9 +52,15 @@ protected ReactiveView(IntPtr handle) : base(handle) { } +#if UNIFIED + protected ReactiveView(CGRect frame) : base(frame) + { + } +#else protected ReactiveView(RectangleF size) : base(size) { } +#endif public event PropertyChangingEventHandler PropertyChanging { add { PropertyChangingEventManager.AddHandler(this, value); } diff --git a/ReactiveUI_XSIOS.sln b/ReactiveUI_XSIOS.sln index ef86e48317..e129a8c563 100644 --- a/ReactiveUI_XSIOS.sln +++ b/ReactiveUI_XSIOS.sln @@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI_iOS", "ReactiveU EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Events_iOS_XS", "ReactiveUI.Events\ReactiveUI.Events_iOS_XS.csproj", "{334E6DAC-0D70-4CE0-80CB-DFD3147DBE18}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI_iOS64", "ReactiveUI\ReactiveUI_iOS64.csproj", "{AF913370-A394-4DBD-801E-15E1FDA78FFC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -165,6 +167,32 @@ Global {9091337A-9E94-4DBD-801E-15E1FDA78FFC}.Release|Mixed Platforms.Build.0 = Release|Any CPU {9091337A-9E94-4DBD-801E-15E1FDA78FFC}.Release|x86.ActiveCfg = Release|Any CPU {9091337A-9E94-4DBD-801E-15E1FDA78FFC}.Release|x86.Build.0 = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.AppStore|Any CPU.ActiveCfg = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.AppStore|Any CPU.Build.0 = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.AppStore|iPhone.ActiveCfg = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.AppStore|iPhone.Build.0 = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|iPhone.Build.0 = Debug|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|x86.ActiveCfg = Debug|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Debug|x86.Build.0 = Debug|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|Any CPU.Build.0 = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|iPhone.ActiveCfg = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|iPhone.Build.0 = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|x86.ActiveCfg = Release|Any CPU + {AF913370-A394-4DBD-801E-15E1FDA78FFC}.Release|x86.Build.0 = Release|Any CPU {9091337A-9E94-4DBD-801E-05E1FDA78FFC}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU {9091337A-9E94-4DBD-801E-05E1FDA78FFC}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU {9091337A-9E94-4DBD-801E-05E1FDA78FFC}.AppStore|Any CPU.ActiveCfg = Release|Any CPU @@ -221,7 +249,6 @@ Global GlobalSection(NestedProjects) = preSolution EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = ReactiveUI.Testing\ReactiveUI.Testing_iOS.csproj Policies = $0 $0.TextStylePolicy = $1 $1.inheritsSet = null