MacGui: fixed some warnings.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6486 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/DockTextField.m b/macosx/DockTextField.m
index 408b7da0bc10d94b5d686165f4e36a62797ee125..661dc45a0e6ad70e8106c7c630d7217e8dba3ab9 100644 (file)
--- 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 1a5f7c47b697308a003ea7da1495cc94c5454e9b..afad545126fa0a409732acdb78920fdadb90ad27 100644 (file)
--- 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 fb5e87acb11fc447ff56d21335d50f5e8d568e36..63e18d515b849bac7107deaef4622474303f58ea 100644 (file)
--- 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 73260174398eb48f4931253286629eea60da2a43..5452b186a338e237441883fce060bd193ccc3c3f 100644 (file)
--- 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 187d963162b9946cf3edc07364b07b72f434a2e8..91ed94c8de591c2c6da2abb2778f1188f2ae3abe 100644 (file)
--- 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 4f7c3c8bd0654a57cac1b6a7f09c3ff9290ecd2b..379c35aed4c374b5eb00b2dc418a3624e985070a 100644 (file)
--- 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 3c458abacc45200f623e99f2674e5f29c16fed52..f984233942bbe7749c1ea2dc7a06eda645892647 100644 (file)
--- 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