7 files changed, 3 insertions, 19 deletions
diff --git a/macosx/DockTextField.m b/macosx/DockTextField.m
index 408b7da0b..661dc45a0 100644
--- a/macosx/DockTextField.m
+++ b/macosx/DockTextField.m
@@ -19,7 +19,7 @@
 {
     self = [super initWithFrame:frame];
     if (self) {
-        [[self cell] setBezelStyle: NSTextFieldRoundedBezel];
+        [[self cell] setBezelStyle:NSRoundedBezelStyle];
         _textToDisplay = @"";
         [self changeGradientColors:[NSColor grayColor] endColor:[NSColor blackColor]];
     }
diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m
index 1a5f7c47b..afad54512 100644
--- a/macosx/HBAudioController.m
+++ b/macosx/HBAudioController.m
@@ -536,12 +536,11 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification";
 - (IBAction)showSettingsSheet:(id)sender
 {
     self.defaultsController = [[[HBAudioDefaultsController alloc] initWithSettings:self.settings] autorelease];
-    self.defaultsController.delegate = self;
 
 	[NSApp beginSheet:[self.defaultsController window]
        modalForWindow:[[self view] window]
         modalDelegate:self
-       didEndSelector:NULL
+       didEndSelector:@selector(sheetDidEnd)
           contextInfo:NULL];
 }
 
diff --git a/macosx/HBAudioDefaultsController.h b/macosx/HBAudioDefaultsController.h
index fb5e87acb..63e18d515 100644
--- a/macosx/HBAudioDefaultsController.h
+++ b/macosx/HBAudioDefaultsController.h
@@ -12,6 +12,4 @@
 
 - (instancetype)initWithSettings:(HBAudioDefaults *)settings;
 
-@property (nonatomic, readwrite, assign) id delegate;
-
 @end
diff --git a/macosx/HBAudioDefaultsController.m b/macosx/HBAudioDefaultsController.m
index 732601743..5452b186a 100644
--- a/macosx/HBAudioDefaultsController.m
+++ b/macosx/HBAudioDefaultsController.m
@@ -87,11 +87,6 @@ static void *HBAudioDefaultsContex = &HBAudioDefaultsContex;
 
     [self.settings.trackSelectionLanguages removeAllObjects];
     [self.settings.trackSelectionLanguages addObjectsFromArray:self.languagesList.selectedLanguages];
-
-    if ([self.delegate respondsToSelector:@selector(sheetDidEnd)])
-    {
-        [self.delegate performSelector:@selector(sheetDidEnd)];
-    }
 }
 
 - (void)dealloc
diff --git a/macosx/HBSubtitlesController.m b/macosx/HBSubtitlesController.m
index 187d96316..91ed94c8d 100644
--- a/macosx/HBSubtitlesController.m
+++ b/macosx/HBSubtitlesController.m
@@ -341,12 +341,11 @@ NSString *keySubTrackLanguageIndex = @"keySubTrackLanguageIndex";
 - (IBAction)showSettingsSheet:(id)sender
 {
     self.defaultsController = [[[HBSubtitlesDefaultsController alloc] initWithSettings:self.settings] autorelease];
-    self.defaultsController.delegate = self;
 
 	[NSApp beginSheet:[self.defaultsController window]
        modalForWindow:[[self view] window]
         modalDelegate:self
-       didEndSelector:NULL
+       didEndSelector:@selector(sheetDidEnd)
           contextInfo:NULL];
 }
 
diff --git a/macosx/HBSubtitlesDefaultsController.h b/macosx/HBSubtitlesDefaultsController.h
index 4f7c3c8bd..379c35aed 100644
--- a/macosx/HBSubtitlesDefaultsController.h
+++ b/macosx/HBSubtitlesDefaultsController.h
@@ -12,6 +12,4 @@
 
 - (instancetype)initWithSettings:(HBSubtitlesDefaults *)settings;
 
-@property (nonatomic, readwrite, assign) id delegate;
-
 @end
diff --git a/macosx/HBSubtitlesDefaultsController.m b/macosx/HBSubtitlesDefaultsController.m
index 3c458abac..f98423394 100644
--- a/macosx/HBSubtitlesDefaultsController.m
+++ b/macosx/HBSubtitlesDefaultsController.m
@@ -70,11 +70,6 @@ static void *HBSubtitlesDefaultsContex = &HBSubtitlesDefaultsContex;
 
     [self.settings.trackSelectionLanguages removeAllObjects];
     [self.settings.trackSelectionLanguages addObjectsFromArray:self.languagesList.selectedLanguages];
-
-    if ([self.delegate respondsToSelector:@selector(sheetDidEnd)])
-    {
-        [self.delegate performSelector:@selector(sheetDidEnd)];
-    }
 }
 
 - (void)dealloc