* Made the open dialog a wxDialog to be able to call it from the wizard. Please test...

[vlc] / modules / gui / wxwindows / playlist.cpp

diff --git a/modules/gui/wxwindows/playlist.cpp b/modules/gui/wxwindows/playlist.cpp
index 0d01b28fc8f8b3d58f1a849c9d01e66b4d2ec54e..73ea44750c46506736ff4701766608a244231a7c 100644 (file)
--- a/modules/gui/wxwindows/playlist.cpp
+++ b/modules/gui/wxwindows/playlist.cpp
@@ -242,7 +242,7 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
     popup_menu = new wxMenu;
     popup_menu->Append( PopupPlay_Event, wxU(_("Play")) );
     popup_menu->Append( PopupDel_Event, wxU(_("Delete")) );
-    popup_menu->Append( PopupEna_Event, wxU(_("Toggle enabled")) );
+    popup_menu->Append( PopupEna_Event, wxU(_("Enable/Disable")) );
     popup_menu->Append( PopupInfo_Event, wxU(_("Info")) );
 
     /* Create a panel to put everything in */
@@ -358,7 +358,7 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
     main_sizer->Layout();
     SetSizerAndFit( main_sizer );
 
-#if !defined(__WXX11__)
+#if wxUSE_DRAG_AND_DROP
     /* Associate drop targets with the playlist */
     SetDropTarget( new DragAndDrop( p_intf, VLC_TRUE ) );
 #endif
@@ -623,9 +623,9 @@ void Playlist::OnSave( wxCommandEvent& WXUNUSED(event) )
 
     if( dialog.ShowModal() == wxID_OK )
     {
-        if( dialog.GetFilename().mb_str() )
+        if( dialog.GetPath().mb_str() )
         {
-            playlist_Export( p_playlist, dialog.GetFilename().mb_str(),
+            playlist_Export( p_playlist, dialog.GetPath().mb_str(),
                              formats[dialog.GetFilterIndex()].psz_module );
         }
     }