* fixes item deletion when pressing backspace. Doesn't work for nodes yet

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index ee971181ac4da835bd5771af0bf35835e9b83ab0..365e356130715320ae154ce419dd65761338230a 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -6,7 +6,6 @@
             ACTIONS = {showPanel = id; }; 
             CLASS = VLAboutBox; 
             LANGUAGE = ObjC; 
-            OUTLETS = {}; 
             SUPERCLASS = NSObject; 
         }, 
         {CLASS = VLBrushedMetalImageView; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, 
@@ -413,7 +412,7 @@
             }; 
             SUPERCLASS = NSObject; 
         }, 
-        {CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }, 
+        {CLASS = VLCPlaylistView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, 
         {
             ACTIONS = {advancedToggle = id; closePrefs = id; resetAll = id; savePrefs = id; }; 
             CLASS = VLCPrefs; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
index 1010573a913e13051b2546d9609a6bc0eddaeaa7..86bf1bda4185eceac1533d88d75554c95a670617 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
@@ -9,9 +9,9 @@
                <key>1617</key>
                <string>542 480 104 149 0 0 1024 746 </string>
                <key>2197</key>
-               <string>102 199 596 368 0 0 800 578 </string>
+               <string>237 313 596 367 0 0 1024 746 </string>
                <key>29</key>
-               <string>53 507 419 44 0 0 800 578 </string>
+               <string>84 667 419 44 0 0 1024 746 </string>
                <key>915</key>
                <string>54 452 185 199 0 0 1024 746 </string>
        </dict>
@@ -27,9 +27,9 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
-               <integer>2197</integer>
-               <integer>29</integer>
                <integer>21</integer>
+               <integer>29</integer>
+               <integer>2197</integer>
        </array>
        <key>IBSystem Version</key>
        <string>7R28</string>

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 10f58f90d897c0267a7e61075c218fd1e8c7d122..24cb3f8c9d58372cc973c7a57866dbadbf0b464d 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 8d46c844978c0a214dec6cc88c9824cffb8c6153..ab4e98d65cc470b650885104ab089de14fdc31ba 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -98,6 +98,7 @@ msg_Dbg( p_intf, "KEYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY");
             c = [o_to_delete count];
 
             for( i = 0; i < c; i++ ) {
+                playlist_item_t * p_item;
                 o_number = [o_to_delete lastObject];
                 i_row = [o_number intValue];
 
@@ -107,7 +108,9 @@ msg_Dbg( p_intf, "KEYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY");
                 }
                 [o_to_delete removeObject: o_number];
                 [self deselectRow: i_row];
-                playlist_ItemDelete( [[self itemAtRow: i_row] pointerValue] );
+                p_item = (playlist_item_t *)[[self itemAtRow: i_row]pointerValue];
+                playlist_Delete( p_playlist, p_item->input.i_id );
+                [self reloadData];
             }
             break;