From 5c66104d253ab23d3b0b9108ef92d5dc46c8ffbf Mon Sep 17 00:00:00 2001 From: Alexandre Wilhelm Date: Sun, 29 Jun 2014 19:35:47 -0700 Subject: [PATCH] Fixed: methodsare public instead of private in CPPopover --- AppKit/CPPopover.j | 17 ++++++++--------- AppKit/_CPPopoverWindow.j | 12 +++++------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/AppKit/CPPopover.j b/AppKit/CPPopover.j index 3f5ee8b20..ec30b256e 100644 --- a/AppKit/CPPopover.j +++ b/AppKit/CPPopover.j @@ -257,12 +257,12 @@ Set the behavior of the CPPopover. It can be: [_popoverWindow setContentView:[_contentViewController view]]; if (![self isShown]) - [self popoverWillShow:self]; + [self _popoverWillShow]; [_popoverWindow positionRelativeToRect:positioningRect ofView:positioningView preferredEdge:preferredEdge]; if (![self isShown]) - [self popoverDidShow:self]; + [self _popoverDidShow]; } - (unsigned)styleMaskForBehavior @@ -297,8 +297,7 @@ Set the behavior of the CPPopover. It can be: if ([_popoverWindow isClosing] || ![self isShown]) return; - if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_) - [_delegate popoverWillClose:self]; + [self _popoverWillClose]; _positioningView = nil; [_popoverWindow close]; @@ -333,7 +332,7 @@ Set the behavior of the CPPopover. It can be: #pragma mark Delegates /*! @ignore */ -- (BOOL)popoverWindowShouldClose:(_CPPopoverWindow)aPopoverWindow +- (BOOL)_popoverWindowShouldClose { [self performClose:self]; @@ -344,28 +343,28 @@ Set the behavior of the CPPopover. It can be: } /*! @ignore */ -- (void)popoverWindowDidClose:(_CPPopoverWindow)aPopoverWindow +- (void)_popoverWindowDidClose { if (_implementedDelegateMethods & CPPopoverDelegate_popover_didClose_) [_delegate popoverDidClose:self]; } /*! @ignore */ -- (void)popoverWindowDidShow:(_CPPopoverWindow)aPopoverWindow +- (void)_popoverWindowDidShow { if (_implementedDelegateMethods & CPPopoverDelegate_popover_didShow_) [_delegate popoverDidShow:self]; } /*! @ignore */ -- (void)popoverWillClose:(_CPPopoverWindow)aPopoverWindow +- (void)_popoverWillClose { if (_implementedDelegateMethods & CPPopoverDelegate_popover_willClose_) [_delegate popoverWillClose:self]; } /*! @ignore */ -- (void)popoverWillShow:(_CPPopoverWindow)aPopoverWindow +- (void)_popoverWillShow { if (_implementedDelegateMethods & CPPopoverDelegate_popover_willShow_) [_delegate popoverWillShow:self]; diff --git a/AppKit/_CPPopoverWindow.j b/AppKit/_CPPopoverWindow.j index 945f3b960..94fea5b1a 100644 --- a/AppKit/_CPPopoverWindow.j +++ b/AppKit/_CPPopoverWindow.j @@ -157,13 +157,13 @@ var _CPPopoverWindow_shouldClose_ = 1 << 4, _delegate = aDelegate; _implementedDelegateMethods = 0; - if ([_delegate respondsToSelector:@selector(popoverWindowShouldClose:)]) + if ([_delegate respondsToSelector:@selector(_popoverWindowShouldClose:)]) _implementedDelegateMethods |= _CPPopoverWindow_shouldClose_; - if ([_delegate respondsToSelector:@selector(popoverWindowDidClose:)]) + if ([_delegate respondsToSelector:@selector(_popoverWindowDidClose:)]) _implementedDelegateMethods |= _CPPopoverWindow_didClose_; - if ([_delegate respondsToSelector:@selector(popoverWindowDidShow:)]) + if ([_delegate respondsToSelector:@selector(_popoverWindowDidShow:)]) _implementedDelegateMethods |= _CPPopoverWindow_didShow_; } @@ -530,8 +530,7 @@ var _CPPopoverWindow_shouldClose_ = 1 << 4, #endif _isOpening = NO; - if (_implementedDelegateMethods & _CPPopoverWindow_didShow_) - [_delegate popoverWindowDidShow:self]; + [_delegate _popoverWindowDidShow]; } #if PLATFORM(DOM) @@ -629,8 +628,7 @@ var _CPPopoverWindow_shouldClose_ = 1 << 4, _isOpening = NO; _targetWindow = nil; - if (_implementedDelegateMethods & _CPPopoverWindow_didClose_) - [_delegate popoverWindowDidClose:self]; + [_delegate _popoverWindowDidClose]; }