Start modernising ObjC

1 files changed, 12 insertions, 10 deletions

diff --git a/frontends/cocoa/ScrollableView.m b/frontends/cocoa/ScrollableView.m
index e31d90ade..b2210d059 100644
--- a/frontends/cocoa/ScrollableView.m
+++ b/frontends/cocoa/ScrollableView.m
@@ -20,24 +20,25 @@
 
 @interface ScrollableView ()
 
+@property (weak, nonatomic) NSView *observedSuperview;
+
 - (void)frameChangeNotification:(NSNotification *)note;
 
 @end
 
 @implementation ScrollableView
-@synthesize minimumSize;
 
 - (void)setMinimumSize:(NSSize)newSize
 {
-    minimumSize = newSize;
+    _minimumSize = newSize;
     [self adjustFrame];
 }
 
 - (void)adjustFrame
 {
     NSSize frameSize = [[self superview] frame].size;
-    [self setFrameSize:NSMakeSize(MAX(minimumSize.width, frameSize.width),
-                           MAX(minimumSize.height, frameSize.height))];
+    [self setFrameSize:NSMakeSize(MAX(self.minimumSize.width, frameSize.width),
+                           MAX(self.minimumSize.height, frameSize.height))];
 }
 
 - (void)frameChangeNotification:(NSNotification *)note
@@ -47,24 +48,25 @@
 
 - (void)viewDidMoveToSuperview
 {
-    if (observedSuperview) {
+    NSView *oldSuperview = _observedSuperview;
+    _observedSuperview = nil;
+    if (oldSuperview) {
         [[NSNotificationCenter defaultCenter]
             removeObserver:self
                       name:NSViewFrameDidChangeNotification
-                    object:observedSuperview];
-        observedSuperview = nil;
+                    object:oldSuperview];
     }
 
     NSView *newSuperView = [self superview];
 
     if (nil != newSuperView) {
-        observedSuperview = newSuperView;
+        _observedSuperview = newSuperView;
         [[NSNotificationCenter defaultCenter]
             addObserver:self
                selector:@selector(frameChangeNotification:)
                    name:NSViewFrameDidChangeNotification
-                 object:observedSuperview];
-        [observedSuperview setPostsFrameChangedNotifications:YES];
+                 object:newSuperView];
+        newSuperView.postsFrameChangedNotifications = YES;
     }
 }