X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fwxwidgets%2Finterface.cpp;h=be87604472aebbf27228c75f3663a634c1f9b8ca;hb=266e4aa0177e922ad0819982d5ed5db9fce62f10;hp=9a01ec2227c0bbe2c53e75e3a1fa74d5b0f67d59;hpb=0115df1f0fc7e5c11f8bc9a889755ce7f5a7cc8f;p=vlc diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp index 9a01ec2227..be87604472 100644 --- a/modules/gui/wxwidgets/interface.cpp +++ b/modules/gui/wxwidgets/interface.cpp @@ -341,6 +341,8 @@ Interface::~Interface() GetPosition(), GetSize() ); } + PopEventHandler(true); + if( video_window ) delete video_window; #ifdef wxHAS_TASK_BAR_ICON @@ -863,6 +865,10 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) ) msg.Printf( wxString(wxT("VLC media player " PACKAGE_VERSION)) + wxU(_(" (wxWidgets interface)\n\n")) + wxU(_("(c) 1996-2005 - the VideoLAN Team\n\n")) + + wxU(_("Compiled by "))+ wxU(VLC_CompileBy())+ wxU("@") + + wxU(VLC_CompileHost())+ wxT(".")+ wxU(VLC_CompileDomain())+ wxT(".\n") + + wxU(_("Compiler: "))+ wxU(VLC_Compiler())+wxT( ".\n") + + wxU(_("Based on SVN revision: "))+wxU(VLC_Changeset())+wxT(".\n\n") + #ifdef __WXMSW__ wxU( vlc_wraptext(INTF_ABOUT_MSG,WRAPCOUNT,VLC_TRUE) ) + wxT("\n\n") + #else @@ -1366,10 +1372,13 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord, } for( size_t i = 0; i < filenames.GetCount(); i++ ) - playlist_Add( p_playlist, (const char *)filenames[i].mb_str(), - (const char *)filenames[i].mb_str(), + { + char *psz_utf8 = FromLocale( filenames[i].mb_str() ); + playlist_Add( p_playlist, psz_utf8, psz_utf8, PLAYLIST_APPEND | ((i | b_enqueue) ? 0 : PLAYLIST_GO), PLAYLIST_END ); + LocaleFree( psz_utf8 ); + } vlc_object_release( p_playlist );