Commit 0768985b authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx: removed delegate protocol declarations introduced in previous commit

This is a 10.6+ feature and therefore breaks compilation on 10.5
parent 4d614219
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#import "misc.h" #import "misc.h"
@interface VLCEmbeddedWindow : NSWindow <NSWindowDelegate, NSAnimationDelegate> @interface VLCEmbeddedWindow : NSWindow
{ {
IBOutlet id o_btn_backward; IBOutlet id o_btn_backward;
IBOutlet id o_btn_forward; IBOutlet id o_btn_forward;
......
...@@ -97,7 +97,7 @@ struct intf_sys_t ...@@ -97,7 +97,7 @@ struct intf_sys_t
@class VLCEmbeddedWindow; @class VLCEmbeddedWindow;
@class VLCControls; @class VLCControls;
@class VLCPlaylist; @class VLCPlaylist;
@interface VLCMain : NSObject <NSToolbarDelegate, NSWindowDelegate, NSURLConnectionDelegate> @interface VLCMain : NSObject
{ {
intf_thread_t *p_intf; /* The main intf object */ intf_thread_t *p_intf; /* The main intf object */
id o_prefs; /* VLCPrefs */ id o_prefs; /* VLCPrefs */
......
...@@ -980,7 +980,6 @@ static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl"; ...@@ -980,7 +980,6 @@ static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl";
-(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event -(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event
{ {
NSLog( @"received event with keyCode %ld, handle? %i", (([event data1] & 0xFFFF0000) >> 16), b_mediaKeySupport );
if( b_mediaKeySupport ) if( b_mediaKeySupport )
{ {
assert([event type] == NSSystemDefined && [event subtype] == SPSystemDefinedEventMediaKeys); assert([event type] == NSSystemDefined && [event subtype] == SPSystemDefinedEventMediaKeys);
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
* Missing extension to NSWindow * Missing extension to NSWindow
*****************************************************************************/ *****************************************************************************/
@interface VLCWindow : NSWindow <NSWindowDelegate> @interface VLCWindow : NSWindow
{ {
BOOL b_canBecomeKeyWindow; BOOL b_canBecomeKeyWindow;
BOOL b_isset_canBecomeKeyWindow; BOOL b_isset_canBecomeKeyWindow;
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
/***************************************************************************** /*****************************************************************************
* VLCPlaylistCommon interface * VLCPlaylistCommon interface
*****************************************************************************/ *****************************************************************************/
@interface VLCPlaylistCommon : NSObject <NSFileManagerDelegate, NSComboBoxDataSource> @interface VLCPlaylistCommon : NSObject
{ {
IBOutlet id o_tc_name; IBOutlet id o_tc_name;
IBOutlet id o_tc_author; IBOutlet id o_tc_author;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
@class VLCInfoTreeItem; @class VLCInfoTreeItem;
@interface VLCInfo : NSObject <NSFileManagerDelegate> @interface VLCInfo : NSObject
{ {
IBOutlet id o_info_window; IBOutlet id o_info_window;
IBOutlet id o_uri_lbl; IBOutlet id o_uri_lbl;
......
...@@ -69,7 +69,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -69,7 +69,7 @@ static NSMenu *o_keys_menu = nil;
@end @end
@interface StringListConfigControl : VLCConfigControl <NSComboBoxDataSource> @interface StringListConfigControl : VLCConfigControl
{ {
NSComboBox *o_combo; NSComboBox *o_combo;
} }
...@@ -104,7 +104,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -104,7 +104,7 @@ static NSMenu *o_keys_menu = nil;
@end @end
@interface IntegerConfigControl : VLCConfigControl <NSTextFieldDelegate> @interface IntegerConfigControl : VLCConfigControl
{ {
NSTextField *o_textfield; NSTextField *o_textfield;
NSStepper *o_stepper; NSStepper *o_stepper;
...@@ -118,7 +118,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -118,7 +118,7 @@ static NSMenu *o_keys_menu = nil;
@end @end
@interface IntegerListConfigControl : VLCConfigControl <NSComboBoxDataSource> @interface IntegerListConfigControl : VLCConfigControl
{ {
NSComboBox *o_combo; NSComboBox *o_combo;
} }
...@@ -128,7 +128,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -128,7 +128,7 @@ static NSMenu *o_keys_menu = nil;
@end @end
@interface RangedIntegerConfigControl : VLCConfigControl <NSTextFieldDelegate> @interface RangedIntegerConfigControl : VLCConfigControl
{ {
NSSlider *o_slider; NSSlider *o_slider;
NSTextField *o_textfield; NSTextField *o_textfield;
...@@ -154,7 +154,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -154,7 +154,7 @@ static NSMenu *o_keys_menu = nil;
@end @end
@interface FloatConfigControl : VLCConfigControl <NSTextFieldDelegate> @interface FloatConfigControl : VLCConfigControl
{ {
NSTextField *o_textfield; NSTextField *o_textfield;
NSStepper *o_stepper; NSStepper *o_stepper;
...@@ -168,7 +168,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -168,7 +168,7 @@ static NSMenu *o_keys_menu = nil;
@end @end
@interface RangedFloatConfigControl : VLCConfigControl <NSTextFieldDelegate> @interface RangedFloatConfigControl : VLCConfigControl
{ {
NSSlider *o_slider; NSSlider *o_slider;
NSTextField *o_textfield; NSTextField *o_textfield;
...@@ -194,7 +194,7 @@ static NSMenu *o_keys_menu = nil; ...@@ -194,7 +194,7 @@ static NSMenu *o_keys_menu = nil;
@end @end
@interface ModuleListConfigControl : VLCConfigControl <NSTableViewDataSource> @interface ModuleListConfigControl : VLCConfigControl
{ {
NSTextField *o_textfield; NSTextField *o_textfield;
NSScrollView *o_scrollview; NSScrollView *o_scrollview;
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
/***************************************************************************** /*****************************************************************************
* VLCSidebar interface * VLCSidebar interface
*****************************************************************************/ *****************************************************************************/
@interface VLCSidebar : NSObject <NSFileManagerDelegate, NSComboBoxDataSource> @interface VLCSidebar : NSObject
{ {
IBOutlet id o_outline_view; IBOutlet id o_outline_view;
IBOutlet id o_playlist; IBOutlet id o_playlist;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#import "intf.h" #import "intf.h"
#import <vlc_common.h> #import <vlc_common.h>
@interface VLCSimplePrefs : NSObject <NSToolbarDelegate> @interface VLCSimplePrefs : NSObject
{ {
IBOutlet id o_audio_dolby_pop; IBOutlet id o_audio_dolby_pop;
IBOutlet id o_audio_dolby_txt; IBOutlet id o_audio_dolby_txt;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment