From 54aaf840dc43413d7d514e345456dce5352d4c8a Mon Sep 17 00:00:00 2001 From: Antoine Cellerier Date: Tue, 7 Mar 2006 18:48:35 +0000 Subject: [PATCH] Fix wx DnD once more. --- modules/gui/wxwidgets/dialogs/playlist.cpp | 5 +++-- modules/gui/wxwidgets/interface.cpp | 5 +++-- modules/gui/wxwidgets/wxwidgets.hpp | 13 ++++++++----- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/modules/gui/wxwidgets/dialogs/playlist.cpp b/modules/gui/wxwidgets/dialogs/playlist.cpp index c4102e8416..612c3e7d70 100644 --- a/modules/gui/wxwidgets/dialogs/playlist.cpp +++ b/modules/gui/wxwidgets/dialogs/playlist.cpp @@ -1292,12 +1292,13 @@ bool PlaylistFileDropTarget::OnDropFiles( wxCoord x, wxCoord y, /* Put the items in the playlist node */ for( size_t i = 0; i < filenames.GetCount(); i++ ) { - const char *psz_utf8 = wxDnDFromLocale( filenames[i] ); + char *psz_local = NULL; + const char *psz_utf8 = wxDnDFromLocale( filenames[i], psz_local ); playlist_item_t *p_item = playlist_ItemNew( p->p_playlist, psz_utf8, psz_utf8 ); playlist_NodeAddItem( p->p_playlist, p_item, p->i_current_view, p_dest, PLAYLIST_PREPARSE, i_pos ); - wxDnDLocaleFree( psz_utf8 ); + wxDnDLocaleFree( psz_utf8, psz_local ); } /* FIXME: having this Rebuild() is dirty */ diff --git a/modules/gui/wxwidgets/interface.cpp b/modules/gui/wxwidgets/interface.cpp index 712a831d06..1f43383784 100644 --- a/modules/gui/wxwidgets/interface.cpp +++ b/modules/gui/wxwidgets/interface.cpp @@ -1261,13 +1261,14 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord, for( size_t i = 0; i < filenames.GetCount(); i++ ) { - const char *psz_utf8 = wxDnDFromLocale( filenames[i] ); + char *psz_local = NULL; + const char *psz_utf8 = wxDnDFromLocale( filenames[i], psz_local ); playlist_Add( p_playlist, psz_utf8, psz_utf8, PLAYLIST_APPEND | ((i | b_enqueue) ? 0 : PLAYLIST_GO), PLAYLIST_END ); - wxDnDLocaleFree( psz_utf8 ); + wxDnDLocaleFree( psz_utf8, psz_local ); } vlc_object_release( p_playlist ); diff --git a/modules/gui/wxwidgets/wxwidgets.hpp b/modules/gui/wxwidgets/wxwidgets.hpp index 5bed810548..d35e644553 100644 --- a/modules/gui/wxwidgets/wxwidgets.hpp +++ b/modules/gui/wxwidgets/wxwidgets.hpp @@ -98,7 +98,7 @@ DECLARE_LOCAL_EVENT_TYPE( wxEVT_INTF, 1 ); /* From Locale functions to use for File Drop targets ... go figure */ #ifdef wxUSE_UNICODE -inline const char *wxDnDFromLocale( const wxChar *stupid ) +inline const char *wxDnDFromLocale( const wxChar *stupid, char *psz_local ) { /* * FIXME: this is yet another awful and ugly bug-to-bug work-around @@ -120,19 +120,22 @@ inline const char *wxDnDFromLocale( const wxChar *stupid ) for (braindead = stupid; *braindead; braindead++); size_t i = (braindead - stupid); - char *psz_local = (char *)malloc( i + 1 ); + psz_local = (char *)malloc( i + 1 ); do psz_local[i] = (char)stupid[i]; while (i--); const char *psz_utf8 = FromLocale( psz_local ); - free( psz_local ); return psz_utf8; } #else -# define wxDnDFromLocale( string ) wxFromLocale( string ) +# define wxDnDFromLocale( string, a ) wxFromLocale( string ) +#endif +#ifdef wxUSE_UNICODE +# define wxDnDLocaleFree( string, a ) LocaleFree( string ); free( a ) +#else +# define wxDnDLocaleFree( string, a ) wxLocaleFree( string ) #endif -#define wxDnDLocaleFree(string) LocaleFree( string ) #define WRAPCOUNT 80