[vlc-commits] macosx: removed delegate protocol declarations introduced in previous commit
Felix Paul Kühne
git at videolan.org
Sun Apr 17 21:42:04 CEST 2011
vlc/vlc-1.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Apr 17 21:41:53 2011 +0200| [0768985bdab66d06f2af791285979a98843476c8] | committer: 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
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=0768985bdab66d06f2af791285979a98843476c8
---
modules/gui/macosx/embeddedwindow.h | 2 +-
modules/gui/macosx/intf.h | 2 +-
modules/gui/macosx/intf.m | 1 -
modules/gui/macosx/misc.h | 2 +-
modules/gui/macosx/playlist.h | 2 +-
modules/gui/macosx/playlistinfo.h | 2 +-
modules/gui/macosx/prefs_widgets.h | 14 +++++++-------
modules/gui/macosx/sidebarview.h | 2 +-
modules/gui/macosx/simple_prefs.h | 2 +-
9 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/modules/gui/macosx/embeddedwindow.h b/modules/gui/macosx/embeddedwindow.h
index da825df..0dcb955 100644
--- a/modules/gui/macosx/embeddedwindow.h
+++ b/modules/gui/macosx/embeddedwindow.h
@@ -27,7 +27,7 @@
#import "misc.h"
- at interface VLCEmbeddedWindow : NSWindow <NSWindowDelegate, NSAnimationDelegate>
+ at interface VLCEmbeddedWindow : NSWindow
{
IBOutlet id o_btn_backward;
IBOutlet id o_btn_forward;
diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index df5f582..531dbe4 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -97,7 +97,7 @@ struct intf_sys_t
@class VLCEmbeddedWindow;
@class VLCControls;
@class VLCPlaylist;
- at interface VLCMain : NSObject <NSToolbarDelegate, NSWindowDelegate, NSURLConnectionDelegate>
+ at interface VLCMain : NSObject
{
intf_thread_t *p_intf; /* The main intf object */
id o_prefs; /* VLCPrefs */
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 1f59b83..f364fef 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -980,7 +980,6 @@ static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl";
-(void)mediaKeyTap:(SPMediaKeyTap*)keyTap receivedMediaKeyEvent:(NSEvent*)event
{
- NSLog( @"received event with keyCode %ld, handle? %i", (([event data1] & 0xFFFF0000) >> 16), b_mediaKeySupport );
if( b_mediaKeySupport )
{
assert([event type] == NSSystemDefined && [event subtype] == SPSystemDefinedEventMediaKeys);
diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h
index 416d4f4..8569d27 100644
--- a/modules/gui/macosx/misc.h
+++ b/modules/gui/macosx/misc.h
@@ -64,7 +64,7 @@
* Missing extension to NSWindow
*****************************************************************************/
- at interface VLCWindow : NSWindow <NSWindowDelegate>
+ at interface VLCWindow : NSWindow
{
BOOL b_canBecomeKeyWindow;
BOOL b_isset_canBecomeKeyWindow;
diff --git a/modules/gui/macosx/playlist.h b/modules/gui/macosx/playlist.h
index 464a4b0..96cee08 100644
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -34,7 +34,7 @@
/*****************************************************************************
* VLCPlaylistCommon interface
*****************************************************************************/
- at interface VLCPlaylistCommon : NSObject <NSFileManagerDelegate, NSComboBoxDataSource>
+ at interface VLCPlaylistCommon : NSObject
{
IBOutlet id o_tc_name;
IBOutlet id o_tc_author;
diff --git a/modules/gui/macosx/playlistinfo.h b/modules/gui/macosx/playlistinfo.h
index c97d83c..c3259a4 100644
--- a/modules/gui/macosx/playlistinfo.h
+++ b/modules/gui/macosx/playlistinfo.h
@@ -28,7 +28,7 @@
@class VLCInfoTreeItem;
- at interface VLCInfo : NSObject <NSFileManagerDelegate>
+ at interface VLCInfo : NSObject
{
IBOutlet id o_info_window;
IBOutlet id o_uri_lbl;
diff --git a/modules/gui/macosx/prefs_widgets.h b/modules/gui/macosx/prefs_widgets.h
index 82ceba8..8d44a77 100644
--- a/modules/gui/macosx/prefs_widgets.h
+++ b/modules/gui/macosx/prefs_widgets.h
@@ -69,7 +69,7 @@ static NSMenu *o_keys_menu = nil;
@end
- at interface StringListConfigControl : VLCConfigControl <NSComboBoxDataSource>
+ at interface StringListConfigControl : VLCConfigControl
{
NSComboBox *o_combo;
}
@@ -104,7 +104,7 @@ static NSMenu *o_keys_menu = nil;
@end
- at interface IntegerConfigControl : VLCConfigControl <NSTextFieldDelegate>
+ at interface IntegerConfigControl : VLCConfigControl
{
NSTextField *o_textfield;
NSStepper *o_stepper;
@@ -118,7 +118,7 @@ static NSMenu *o_keys_menu = nil;
@end
- at interface IntegerListConfigControl : VLCConfigControl <NSComboBoxDataSource>
+ at interface IntegerListConfigControl : VLCConfigControl
{
NSComboBox *o_combo;
}
@@ -128,7 +128,7 @@ static NSMenu *o_keys_menu = nil;
@end
- at interface RangedIntegerConfigControl : VLCConfigControl <NSTextFieldDelegate>
+ at interface RangedIntegerConfigControl : VLCConfigControl
{
NSSlider *o_slider;
NSTextField *o_textfield;
@@ -154,7 +154,7 @@ static NSMenu *o_keys_menu = nil;
@end
- at interface FloatConfigControl : VLCConfigControl <NSTextFieldDelegate>
+ at interface FloatConfigControl : VLCConfigControl
{
NSTextField *o_textfield;
NSStepper *o_stepper;
@@ -168,7 +168,7 @@ static NSMenu *o_keys_menu = nil;
@end
- at interface RangedFloatConfigControl : VLCConfigControl <NSTextFieldDelegate>
+ at interface RangedFloatConfigControl : VLCConfigControl
{
NSSlider *o_slider;
NSTextField *o_textfield;
@@ -194,7 +194,7 @@ static NSMenu *o_keys_menu = nil;
@end
- at interface ModuleListConfigControl : VLCConfigControl <NSTableViewDataSource>
+ at interface ModuleListConfigControl : VLCConfigControl
{
NSTextField *o_textfield;
NSScrollView *o_scrollview;
diff --git a/modules/gui/macosx/sidebarview.h b/modules/gui/macosx/sidebarview.h
index b6b24f9..13c9728 100644
--- a/modules/gui/macosx/sidebarview.h
+++ b/modules/gui/macosx/sidebarview.h
@@ -33,7 +33,7 @@
/*****************************************************************************
* VLCSidebar interface
*****************************************************************************/
- at interface VLCSidebar : NSObject <NSFileManagerDelegate, NSComboBoxDataSource>
+ at interface VLCSidebar : NSObject
{
IBOutlet id o_outline_view;
IBOutlet id o_playlist;
diff --git a/modules/gui/macosx/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index ab22ca5..4ab7a83 100644
--- a/modules/gui/macosx/simple_prefs.h
+++ b/modules/gui/macosx/simple_prefs.h
@@ -25,7 +25,7 @@
#import "intf.h"
#import <vlc_common.h>
- at interface VLCSimplePrefs : NSObject <NSToolbarDelegate>
+ at interface VLCSimplePrefs : NSObject
{
IBOutlet id o_audio_dolby_pop;
IBOutlet id o_audio_dolby_txt;
More information about the vlc-commits
mailing list