From b0026d65ebda05f3fa78a3cf03c0653b31b3f68e Mon Sep 17 00:00:00 2001
From: Mo Ramezanpoor <me@mohsenr.com>
Date: Tue, 16 Aug 2016 15:33:06 +0100
Subject: [PATCH] Fixes RxCocoa for macOS.

---
 RxCocoa/OSX/NSControl+Rx.swift   | 2 +-
 RxCocoa/OSX/NSImageView+Rx.swift | 2 +-
 RxCocoa/OSX/NSTextField+Rx.swift | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RxCocoa/OSX/NSControl+Rx.swift b/RxCocoa/OSX/NSControl+Rx.swift
index 2adeacef..f01be61f 100644
--- a/RxCocoa/OSX/NSControl+Rx.swift
+++ b/RxCocoa/OSX/NSControl+Rx.swift
@@ -47,7 +47,7 @@ extension NSControl {
      You might be wondering why the ugly `as!` casts etc, well, for some reason if
      Swift compiler knows C is UIControl type and optimizations are turned on, it will crash.
     */
-    static func rx_value<C: AnyObject, T: Equatable>(_ control: C, getter: (C) -> T, setter: (C, T) -> Void) -> ControlProperty<T> {
+    static func rx_value<C: AnyObject, T: Equatable>(_ control: C, getter: @escaping (C) -> T, setter: @escaping (C, T) -> Void) -> ControlProperty<T> {
         MainScheduler.ensureExecutingOnScheduler()
 
         let source = (control as! NSObject).rx_lazyInstanceObservable(&rx_value_key) { () -> Observable<T> in
diff --git a/RxCocoa/OSX/NSImageView+Rx.swift b/RxCocoa/OSX/NSImageView+Rx.swift
index a28b2c1e..fbd00ace 100644
--- a/RxCocoa/OSX/NSImageView+Rx.swift
+++ b/RxCocoa/OSX/NSImageView+Rx.swift
@@ -18,7 +18,7 @@ extension NSImageView {
     Bindable sink for `image` property.
     */
     public var rx_image: AnyObserver<NSImage?> {
-        return self.rx_imageAnimated(nil)
+        return self.rx_image(transitionType: nil)
     }
     
     /**
diff --git a/RxCocoa/OSX/NSTextField+Rx.swift b/RxCocoa/OSX/NSTextField+Rx.swift
index ff18908d..af2371d1 100644
--- a/RxCocoa/OSX/NSTextField+Rx.swift
+++ b/RxCocoa/OSX/NSTextField+Rx.swift
@@ -22,7 +22,7 @@ public class RxTextFieldDelegateProxy
     , NSTextFieldDelegate
     , DelegateProxyType {
 
-    private let textSubject = PublishSubject<String>()
+    fileprivate let textSubject = PublishSubject<String>()
 
     /**
      Typed parent object.