macosx: fixed compilation when using the 10.5 SDK

modules/gui/macosx/MainWindow.h

@@ -27,10 +27,7 @@
 #import <Cocoa/Cocoa.h>
 #import "PXSourceList.h"
 #import <vlc_input.h>
-
-#ifndef MAC_OS_X_VERSION_10_6
-@protocol NSWindowDelegate <NSObject> @end
-#endif
+#import "misc.h"
 
 @interface VLCMainWindow : NSWindow <PXSourceListDataSource, PXSourceListDelegate, NSWindowDelegate> {
     IBOutlet id o_play_btn;
@@ -126,4 +123,5 @@
     NSImage * o_time_sld_gradient_right_img;
 }
 - (void)loadImagesInDarkStyle:(BOOL)b_value;
-@end
\ No newline at end of file
+@end
+

modules/gui/macosx/MainWindow.m

@@ -29,7 +29,6 @@
 #import "CoreInteraction.h"
 #import "AudioEffects.h"
 #import "MainMenu.h"
-#import "misc.h"
 #import "controls.h" // TODO: remove me
 #import "SideBarItem.h"
 #import <vlc_playlist.h>

modules/gui/macosx/SideBarItem.h

@@ -11,7 +11,7 @@
 #import <Cocoa/Cocoa.h>
 
 /*An example of a class that could be used to represent a Source List Item
- 
+
  Provides a title, an identifier, and an icon to be shown, as well as a badge value and a property to determine
  whether the current item has a badge or not (`badgeValue` is set to -1 if no badge is shown)
  
@@ -32,7 +32,7 @@
 	NSString *identifier;
 	NSImage *icon;
 	NSInteger badgeValue;
-	
+
 	NSArray *children;
 }
 

modules/gui/macosx/SideBarItem.m

@@ -30,15 +30,15 @@
 	{
 		badgeValue = -1;	//We don't want a badge value by default
 	}
-	
+
 	return self;
 }
 
 
 + (id)itemWithTitle:(NSString*)aTitle identifier:(NSString*)anIdentifier
-{	
+{
 	SideBarItem *item = [SideBarItem itemWithTitle:aTitle identifier:anIdentifier icon:nil];
-	
+
 	return item;
 }
 
@@ -46,11 +46,11 @@
 + (id)itemWithTitle:(NSString*)aTitle identifier:(NSString*)anIdentifier icon:(NSImage*)anIcon
 {
 	SideBarItem *item = [[[SideBarItem alloc] init] autorelease];
-	
+
 	[item setTitle:aTitle];
 	[item setIdentifier:anIdentifier];
 	[item setIcon:anIcon];
-	
+
 	return item;
 }
 
@@ -60,7 +60,7 @@
 	[identifier release];
 	[icon release];
 	[children release];
-	
+
 	[super dealloc];
 }
 
@@ -70,7 +70,7 @@
 	identifier = nil;
 	icon = nil;
 	children = nil;
-	
+
 	[super finalize];
 }
 

modules/gui/macosx/intf.h

@@ -37,6 +37,7 @@
 
 #include <Cocoa/Cocoa.h>
 #import "SPMediaKeyTap.h"                   /* for the media key support */
+#import "misc.h"
 
 /*****************************************************************************
  * Local prototypes.
@@ -78,9 +79,6 @@ struct intf_sys_t
 /*****************************************************************************
  * VLCMain interface
  *****************************************************************************/
-#ifndef MAC_OS_X_VERSION_10_6
-@protocol NSWindowDelegate <NSObject> @end
-#endif
 @class AppleRemote;
 @class VLCInformation;
 @class VLCEmbeddedWindow;

modules/gui/macosx/intf.m

@@ -290,7 +290,7 @@ static int InputEvent( vlc_object_t *p_this, const char *psz_var,
 
         case INPUT_EVENT_DEAD:
             [[VLCMain sharedInstance] updateName];
-            [[VLCMain sharedInstance] updateTimeSlider];
+            [[VLCMain sharedInstance] updatePlaybackPosition];
             break;
 
         case INPUT_EVENT_ABORT:

modules/gui/macosx/playlist.h

@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#import "PXSourceList.h"
+
 /*****************************************************************************
  * VLCPlaylistView interface
  *****************************************************************************/
@@ -34,9 +36,6 @@
 /*****************************************************************************
  * VLCPlaylistCommon interface
  *****************************************************************************/
-#ifndef MAC_OS_X_VERSION_10_6
-@protocol NSOutlineViewDataSource <NSObject> @end
-#endif
 @interface VLCPlaylistCommon : NSObject <NSOutlineViewDataSource, NSOutlineViewDelegate>
 {
     IBOutlet id o_tc_name;

modules/gui/macosx/prefs_widgets.h

@@ -29,6 +29,7 @@
 #ifndef MAC_OS_X_VERSION_10_6
 @protocol NSComboBoxDataSource <NSObject> @end
 @protocol NSTextFieldDelegate <NSObject> @end
+@protocol NSTableViewDataSource <NSObject> @end
 #endif
 
 static NSMenu   *o_keys_menu = nil;