colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-24 19:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: methodsare public instead of private in CPPopover

Browse Source
This commit is contained in:
Alexandre Wilhelm
2014-06-29 19:35:47 -07:00
parent c642d76e91
commit 5c66104d25
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AppKit/CPPopover.j
+8 -9
View File
@@ -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];
AppKit/_CPPopoverWindow.j
+5 -7
View File
@@ -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];
}