Skip to content
This repository was archived by the owner on Nov 19, 2019. It is now read-only.

Commit 963884e

Browse files
author
Michael Ehrmann
committed
[CHANGE] reorder should and will select delegate methods of NSTabViewDelegate to be in a more logical order.
1 parent 005b97e commit 963884e

File tree

1 file changed

+14
-13
lines changed

1 file changed

+14
-13
lines changed

Source/PSMTabBarControl.m

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1972,6 +1972,20 @@ - (BOOL)validateMenuItem:(NSMenuItem *)sender {
19721972
#pragma mark -
19731973
#pragma mark NSTabView Delegate
19741974

1975+
- (BOOL)tabView:(NSTabView *)aTabView shouldSelectTabViewItem:(NSTabViewItem *)tabViewItem {
1976+
if([[self delegate] respondsToSelector:@selector(tabView:shouldSelectTabViewItem:)]) {
1977+
return [[self delegate] tabView:aTabView shouldSelectTabViewItem:tabViewItem];
1978+
} else {
1979+
return YES;
1980+
}
1981+
}
1982+
1983+
- (void)tabView:(NSTabView *)aTabView willSelectTabViewItem:(NSTabViewItem *)tabViewItem {
1984+
if([[self delegate] respondsToSelector:@selector(tabView:willSelectTabViewItem:)]) {
1985+
[[self delegate] performSelector:@selector(tabView:willSelectTabViewItem:) withObject:aTabView withObject:tabViewItem];
1986+
}
1987+
}
1988+
19751989
- (void)tabView:(NSTabView *)aTabView didSelectTabViewItem:(NSTabViewItem *)tabViewItem {
19761990
// here's a weird one - this message is sent before the "tabViewDidChangeNumberOfTabViewItems"
19771991
// message, thus I can end up updating when there are no cells, if no tabs were (yet) present
@@ -2014,19 +2028,6 @@ - (void)tabView:(NSTabView *)aTabView didSelectTabViewItem:(NSTabViewItem *)tabV
20142028
}
20152029
}
20162030

2017-
- (BOOL)tabView:(NSTabView *)aTabView shouldSelectTabViewItem:(NSTabViewItem *)tabViewItem {
2018-
if([[self delegate] respondsToSelector:@selector(tabView:shouldSelectTabViewItem:)]) {
2019-
return [[self delegate] tabView:aTabView shouldSelectTabViewItem:tabViewItem];
2020-
} else {
2021-
return YES;
2022-
}
2023-
}
2024-
- (void)tabView:(NSTabView *)aTabView willSelectTabViewItem:(NSTabViewItem *)tabViewItem {
2025-
if([[self delegate] respondsToSelector:@selector(tabView:willSelectTabViewItem:)]) {
2026-
[[self delegate] performSelector:@selector(tabView:willSelectTabViewItem:) withObject:aTabView withObject:tabViewItem];
2027-
}
2028-
}
2029-
20302031
- (void)tabViewDidChangeNumberOfTabViewItems:(NSTabView *)aTabView {
20312032
NSArray *tabItems = [tabView tabViewItems];
20322033
// go through cells, remove any whose representedObjects are not in [tabView tabViewItems]

0 commit comments

Comments
 (0)