diff options
| author | Abhi Beckert <abhi@Twist-of-Lemon-2.local> | 2015-05-16 08:06:06 +1000 |
|---|---|---|
| committer | Abhi Beckert <abhi@Twist-of-Lemon-2.local> | 2015-05-16 08:06:06 +1000 |
| commit | 57a6f6c73bdaa202164645370d37fcbe5d14a092 (patch) | |
| tree | dd30aa6156064f1d4c0e10ea87059625470fc2f9 /Frameworks/PSMTabBar | |
| parent | b5e972f4504043dfb9c358e272e93fb59ae2127f (diff) | |
| parent | 0f0c43eb74408b6a65a42e2c6fd46f4142ef8e3f (diff) | |
| download | sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.gz sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.tar.bz2 sequelpro-57a6f6c73bdaa202164645370d37fcbe5d14a092.zip | |
Merge remote-tracking branch 'sequelpro/master'
Diffstat (limited to 'Frameworks/PSMTabBar')
| -rw-r--r-- | Frameworks/PSMTabBar/PSMTabBarControl.m | 6 | ||||
| -rw-r--r-- | Frameworks/PSMTabBar/PSMTabBarController.m | 2 | ||||
| -rw-r--r-- | Frameworks/PSMTabBar/PSMTabDragAssistant.m | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/Frameworks/PSMTabBar/PSMTabBarControl.m b/Frameworks/PSMTabBar/PSMTabBarControl.m index 7e8eae87..7c1b059c 100644 --- a/Frameworks/PSMTabBar/PSMTabBarControl.m +++ b/Frameworks/PSMTabBar/PSMTabBarControl.m @@ -193,7 +193,7 @@ if (self) { // Initialization [self initAddedProperties]; - [self registerForDraggedTypes:[NSArray arrayWithObjects:@"PSMTabBarControlItemPBType", nil]]; + [self registerForDraggedTypes:@[@"PSMTabBarControlItemPBType"]]; // resize [self setPostsFrameChangedNotifications:YES]; @@ -1497,7 +1497,7 @@ } // NSDraggingSource -- (NSUInteger)draggingSourceOperationMaskForLocal:(BOOL)isLocal +- (NSDragOperation)draggingSourceOperationMaskForLocal:(BOOL)isLocal { return (isLocal ? NSDragOperationMove : NSDragOperationNone); } @@ -1990,7 +1990,7 @@ // Initialization [self initAddedProperties]; - [self registerForDraggedTypes:[NSArray arrayWithObjects:@"PSMTabBarControlItemPBType", nil]]; + [self registerForDraggedTypes:@[@"PSMTabBarControlItemPBType"]]; if ([aDecoder allowsKeyedCoding]) { _cells = [[aDecoder decodeObjectForKey:@"PSMcells"] retain]; diff --git a/Frameworks/PSMTabBar/PSMTabBarController.m b/Frameworks/PSMTabBar/PSMTabBarController.m index 4ab2c1ef..eddf4174 100644 --- a/Frameworks/PSMTabBar/PSMTabBarController.m +++ b/Frameworks/PSMTabBar/PSMTabBarController.m @@ -633,7 +633,7 @@ static NSInteger potentialMinimumForArray(NSArray *array, NSInteger minimum) } } - return TRUE; + return YES; } - (NSInteger)numberOfItemsInMenu:(NSMenu *)menu diff --git a/Frameworks/PSMTabBar/PSMTabDragAssistant.m b/Frameworks/PSMTabBar/PSMTabDragAssistant.m index bb2d255a..f10eadd4 100644 --- a/Frameworks/PSMTabBar/PSMTabDragAssistant.m +++ b/Frameworks/PSMTabBar/PSMTabDragAssistant.m @@ -192,7 +192,7 @@ static PSMTabDragAssistant *sharedDragAssistant = nil; } [cell setHighlighted:NO]; NSSize offset = NSZeroSize; - [pboard declareTypes:[NSArray arrayWithObjects:@"PSMTabBarControlItemPBType", nil] owner: nil]; + [pboard declareTypes:@[@"PSMTabBarControlItemPBType"] owner:nil]; [pboard setString:[[NSNumber numberWithInteger:[[control cells] indexOfObject:cell]] stringValue] forType:@"PSMTabBarControlItemPBType"]; _animationTimer = [NSTimer scheduledTimerWithTimeInterval:(1.0/30.0) target:self selector:@selector(animateDrag:) userInfo:nil repeats:YES]; @@ -768,7 +768,7 @@ static PSMTabDragAssistant *sharedDragAssistant = nil; PSMTabBarControl *tabBar; while ( (tabBar = [e nextObject]) ) { [self calculateDragAnimationForTabBar:tabBar]; - [[NSRunLoop currentRunLoop] performSelector:@selector(display) target:tabBar argument:nil order:1 modes:[NSArray arrayWithObjects:@"NSEventTrackingRunLoopMode", @"NSDefaultRunLoopMode", nil]]; + [[NSRunLoop currentRunLoop] performSelector:@selector(display) target:tabBar argument:nil order:1 modes:@[@"NSEventTrackingRunLoopMode", @"NSDefaultRunLoopMode"]]; } } |