From 5d06ca53160769f0ecc548be0123200eb754c970 Mon Sep 17 00:00:00 2001 From: Damien Fouilleul Date: Thu, 6 Oct 2005 16:00:42 +0000 Subject: [PATCH] open.cpp: unicode fix for ProbeDVD, ProbeCDDA, ProbeVCD --- modules/gui/wxwidgets/open.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/gui/wxwidgets/open.cpp b/modules/gui/wxwidgets/open.cpp index 3fcd51edc7..09d10ffc02 100644 --- a/modules/gui/wxwidgets/open.cpp +++ b/modules/gui/wxwidgets/open.cpp @@ -1334,7 +1334,7 @@ static char * ProbeDVD(const wxChar *device) { char **ppsz_cd_drives; const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device); - char *psz_device = (char *) tmp_buf; + char *psz_device = const_cast(tmp_buf.data()); if( IsDVD(psz_device) ) { @@ -1404,7 +1404,7 @@ static char * ProbeCDDA(const wxChar *device) { char *ppsz_device[2]; const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device); - char *psz_device = (char *) tmp_buf; + char *psz_device = const_cast(tmp_buf.data()); ppsz_device[0] = (device && *device) ? psz_device : NULL; ppsz_device[1] = NULL; return ProbeDevice(ppsz_device, CDIO_FS_AUDIO, false); @@ -1417,7 +1417,7 @@ static char * ProbeVCD(const wxChar *device) { char *ppsz_device[2]; const wxWX2MBbuf tmp_buf = wxConvCurrent->cWX2MB(device); - char *psz_device = (char *) tmp_buf; + char *psz_device = const_cast(tmp_buf.data()); ppsz_device[0] = (device && *device) ? psz_device : NULL; ppsz_device[1] = NULL; return ProbeDevice(ppsz_device, -- 2.39.2