macosx: merge the nib fle containing Eric Dudiak's interface rework

Makefile.am

@@ -93,8 +93,7 @@ ChangeLog: Makefile.am
 ###############################################################################
 
 EXTRA_DIST += \
-	extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \
-	extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \
+	extras/package/macosx/Resources/English.lproj/MainMenu.nib/designable.nib \
 	extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
 	extras/package/macosx/Resources/English.lproj/MediaInfo.nib/classes.nib \
 	extras/package/macosx/Resources/English.lproj/MediaInfo.nib/info.nib \

extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>246 207 356 240 0 0 1280 778 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>2197</key>
-		<string>342 506 596 123 0 0 1280 778 </string>
-		<key>2709</key>
-		<string>386 537 508 82 0 0 1280 778 </string>
-		<key>29</key>
-		<string>391 728 438 44 0 0 1280 778 </string>
-		<key>3568</key>
-		<string>476 535 328 85 0 0 1280 778 </string>
-		<key>915</key>
-		<string>69 318 187 331 0 0 1280 778 </string>
-	</dict>
-	<key>IBFramework Version</key>
-	<string>489.0</string>
-	<key>IBLastKnownRelativeProjectPath</key>
-	<string>../../vlc.xcodeproj</string>
-	<key>IBOldestOS</key>
-	<integer>4</integer>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>3568</integer>
-		<integer>2416</integer>
-		<integer>29</integer>
-		<integer>21</integer>
-		<integer>2197</integer>
-		<integer>2709</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>9G55</string>
-	<key>targetFramework</key>
-	<string>IBCocoaFramework</string>
-</dict>
-</plist>

modules/gui/macosx/embeddedwindow.m

@@ -53,22 +53,6 @@
 
 @implementation VLCEmbeddedWindow
 
-- (id)initWithContentRect:(NSRect)contentRect styleMask: (NSUInteger)windowStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)deferCreation
-{
-    BOOL b_useTextured = YES;
-    if( [[NSWindow class] instancesRespondToSelector:@selector(setContentBorderThickness:forEdge:)] )
-    {
-        b_useTextured = NO;
-        windowStyle ^= NSTexturedBackgroundWindowMask;
-    }
-    self = [super initWithContentRect:contentRect styleMask:windowStyle backing:bufferingType defer:deferCreation];
-    if(! b_useTextured )
-    {
-        [self setContentBorderThickness:28.0 forEdge:NSMinYEdge];
-    }
-    return self;
-}
-
 - (void)awakeFromNib
 {
     [self setDelegate: self];

modules/gui/macosx/intf.m

@@ -1311,7 +1311,7 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key )
     unichar key = 0;
     vlc_value_t val;
     unsigned int i_pressed_modifiers = 0;
-    struct hotkey *p_hotkeys;
+    const struct hotkey *p_hotkeys;
     int i;
 
     val.i_int = 0;

modules/gui/macosx/playlist.m

@@ -180,7 +180,7 @@
     int i_return = 0;
     playlist_item_t *p_item = NULL;
     playlist_t * p_playlist = pl_Hold( VLCIntf );
-    assert( outlineView == o_outline_view );
+    //assert( outlineView == o_outline_view );
 
     if( !item )
         p_item = p_playlist->p_root_category;