Remove PSMTabBarControl

Author: sfsam

src/MacVim/MMAppController.m

@@ -197,27 +197,10 @@ + (void)initialize
         [NSWindow setAllowsAutomaticWindowTabbing:NO];
     }
 
-    int tabMinWidthKey;
-    int tabMaxWidthKey;
-    int tabOptimumWidthKey;
-    if (shouldUseYosemiteTabBarStyle()) {
-        tabMinWidthKey = 120;
-        tabMaxWidthKey = 0;
-        tabOptimumWidthKey = 0;
-    } else {
-        tabMinWidthKey = 64;
-        tabMaxWidthKey = 6*64;
-        tabOptimumWidthKey = 132;
-    }
-
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
         [NSNumber numberWithBool:NO],     MMNoWindowKey,
-        [NSNumber numberWithInt:tabMinWidthKey],
-                                          MMTabMinWidthKey,
-        [NSNumber numberWithInt:tabMaxWidthKey],
-                                          MMTabMaxWidthKey,
-        [NSNumber numberWithInt:tabOptimumWidthKey],
-                                          MMTabOptimumWidthKey,
+        [NSNumber numberWithInt:120],     MMTabMinWidthKey,
+        [NSNumber numberWithInt:200],     MMTabOptimumWidthKey,
         [NSNumber numberWithBool:YES],    MMShowAddTabButtonKey,
         [NSNumber numberWithInt:2],       MMTextInsetLeftKey,
         [NSNumber numberWithInt:1],       MMTextInsetRightKey,

src/MacVim/MMFullScreenWindow.h

@@ -18,7 +18,6 @@
     NSWindow    *target;
     MMVimView   *view;
     NSPoint     oldPosition;
-    NSString    *oldTabBarStyle;
     int         options;
     int         state;
 

src/MacVim/MMFullScreenWindow.m

@@ -30,7 +30,6 @@
 #import "MMWindowController.h"
 #import "Miscellaneous.h"
 #import <Carbon/Carbon.h>
-#import <PSMTabBarControl/PSMTabBarControl.h>
 
 // These have to be the same as in option.h
 #define FUOPT_MAXVERT         0x001
@@ -164,12 +163,6 @@ - (void)enterFullScreen
     // make target's window controller believe that it's now controlling us
     [[target windowController] setWindow:self];
 
-    oldTabBarStyle = [[view tabBarControl] styleName];
-
-    NSString *style =
-        shouldUseYosemiteTabBarStyle() ? (shouldUseMojaveTabBarStyle() ? @"Mojave" : @"Yosemite") : @"Unified";
-    [[view tabBarControl] setStyleNamed:style];
-
     // add text view
     oldPosition = [view frame].origin;
 
@@ -278,8 +271,6 @@ - (void)leaveFullScreen
     [self retain];  // NSWindowController releases us once
     [[self windowController] setWindow:target];
 
-    [[view tabBarControl] setStyleNamed:oldTabBarStyle];
-
     // fix delegate
     id delegate = [self delegate];
     [self setDelegate:nil];

src/MacVim/MMVimController.m

@@ -690,10 +690,10 @@ - (void)handleMessage:(int)msgid data:(NSData *)data
     } else if (UpdateTabBarMsgID == msgid) {
         [windowController updateTabsWithData:data];
     } else if (ShowTabBarMsgID == msgid) {
-        [windowController showTabBar:YES];
+        [windowController showTabline:YES];
         [self sendMessage:BackingPropertiesChangedMsgID data:nil];
     } else if (HideTabBarMsgID == msgid) {
-        [windowController showTabBar:NO];
+        [windowController showTabline:NO];
         [self sendMessage:BackingPropertiesChangedMsgID data:nil];
     } else if (SetTextDimensionsMsgID == msgid || LiveResizeMsgID == msgid ||
             SetTextDimensionsNoResizeWindowMsgID == msgid ||

src/MacVim/MMVimView.h

@@ -14,7 +14,6 @@
 
 @class MMTabline;
 @class MMTab;
-@class PSMTabBarControl;
 @class MMTextView;
 @class MMScroller;
 @class MMVimController;
@@ -23,8 +22,6 @@
 @interface MMVimView : NSView {
     MMTabline           *tabline;
     MMTab               *tabToClose;
-    PSMTabBarControl    *tabBarControl;
-    NSTabView           *tabView;
     MMVimController     *vimController;
     BOOL                vimTaskSelectedTab;
     MMTextView          *textView;
@@ -45,11 +42,9 @@
 - (void)setDesiredRows:(int)r columns:(int)c;
 
 - (MMTabline *)tabline;
-- (PSMTabBarControl *)tabBarControl;
 - (IBAction)addNewTab:(id)sender;
 - (void)updateTabsWithData:(NSData *)data;
 - (void)selectTabWithIndex:(int)idx;
-- (NSTabViewItem *)addNewTabViewItem;
 - (MMTab *)addNewTab;
 
 - (void)createScrollbarWithIdentifier:(int32_t)ident type:(int)type;