[vlc-devel] commit: macosx: quite obviously, it' s no good idea to require protocols which are available in future APIs only *coughcough* ( Felix Kühne )

[git version control]

vlc | branch: 1.0-bugfix | Felix Kühne <fpk at Bartleby.local> | Sun Aug 16 17:13:21 2009 +0200| [82f6dd20cb8291891264397e7094fe03b2281d60] | committer: Felix Kühne 

macosx: quite obviously, it's no good idea to require protocols which are available in future APIs only *coughcough*

This partially reverts [52b21462ebfcf22a19115b853280bb8fbac5be3b]

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=82f6dd20cb8291891264397e7094fe03b2281d60
---

 modules/gui/macosx/embeddedwindow.h |    2 +-
 modules/gui/macosx/intf.h           |    2 +-
 modules/gui/macosx/misc.h           |    2 +-
 modules/gui/macosx/playlist.h       |    2 +-
 modules/gui/macosx/prefs_widgets.h  |   14 +++++++-------
 modules/gui/macosx/simple_prefs.h   |    2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/gui/macosx/embeddedwindow.h b/modules/gui/macosx/embeddedwindow.h
index e62543c..5c20d1b 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 3ca9e3d..3d1f899 100644
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -90,7 +90,7 @@ struct intf_sys_t
 @class VLCEmbeddedWindow;
 @class VLCControls;
 @class VLCPlaylist;
- at interface VLCMain : NSObject <NSWindowDelegate, NSToolbarDelegate>
+ at interface VLCMain : NSObject
 {
     intf_thread_t *p_intf;      /* The main intf object */
     id o_prefs;                 /* VLCPrefs       */
diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h
index 79af3ba..a27f87c 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 f792ca6..02f291a 100644
--- a/modules/gui/macosx/playlist.h
+++ b/modules/gui/macosx/playlist.h
@@ -34,7 +34,7 @@
 /*****************************************************************************
  * VLCPlaylistCommon interface
  *****************************************************************************/
- at interface VLCPlaylistCommon : NSObject <NSComboBoxDataSource>
+ at interface VLCPlaylistCommon : NSObject
 {
     IBOutlet id o_tc_name;
     IBOutlet id o_tc_author;
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/simple_prefs.h b/modules/gui/macosx/simple_prefs.h
index b4744b0..936a4cf 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;